apstrings 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb0c48b0b98d4a1420e157897e339beeb45c28ed
-  data.tar.gz: c00b6f0d6d440ba8e0c17f13534f52eb2cad149a
+  metadata.gz: be772f78bf7251c0fad0ee9fb522337508b2d468
+  data.tar.gz: fdcae93d017c71fd7209d803a76689132fc5da43
 SHA512:
-  metadata.gz: 59384e5bfe3ed512c2e2238c083f7cc9361891e11c7cd12a811ab85289642c3d00eb5879ba1f40938410be83ca00d26d0e70376292f278c1a6f830f0d9cadb13
-  data.tar.gz: b28dd9e7751a9f3e07831246651a9ff564c44f0cc0f4c71741df4c9e938758ad72a0259ec321d6232c8f38d8846dd8e7a2a4dfe95801ad7ce1a5041c710f783c
+  metadata.gz: b62f98d302f8375c340a47b45a51e5a1562e7d2980a3dac42132a947489a97e04131ab2d137b7c4998cf61a69aca1959c8e1143697dfe5233ac4bcd3af1ee7cd
+  data.tar.gz: 4d244b853c89b478ab18f80ca3d00eb62ce5957633535f90c9d8116e48757251e0e3c5dfb665cf3502679c105d28c3244b380ae930183f3291be16ab4a56d0c7

data/apstrings.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "true"
   spec.add_development_dependency "colored"
   spec.add_development_dependency "json"
+  spec.add_development_dependency "open3"
 
-  
 end

data/bin/apstrings

@@ -34,13 +34,13 @@ files_to_validate["files"].each { |file|
  }
 
 if success && any_file
-	Apstrings::log_info("Success, well done! 🍻 🍻")
+	Apstrings::log_info("Well done! 🍻 🍻")
 	exit(0)
 else if !any_file
 	Apstrings::log_info("Nothing to validate.")
 	exit(0)
 else
-	Apstrings::log_error("Failed: You'd better know what u r doing...")
+	Apstrings::log_error("Failed: You'd better know what r u doing...")
 	exit(1)
 end
 end

data/lib/apstrings.rb

@@ -5,6 +5,7 @@ require 'apstrings/reader'
 require 'apstrings/strings_parser'
 require 'apstrings/strings_validator'
 require 'apstrings/logger'
+require 'open3'
 
   # Public
 	def self.parse(file)
@@ -17,7 +18,37 @@ require 'apstrings/logger'
 	end
 
 	def self.validate(file,masterFile = nil)
-		Validator::validate(file,masterFile)
+  
+    valid_strings , valid_master = false, true
+    Open3.popen3("plutil",  "-lint" ,"#{file}") {|i, o, e, t| 
+        if t.value.exitstatus == 0
+          valid_strings = true
+        else
+          valid_strings = false
+          error =  e.gets
+          output = o.gets
+          message = (error != nil  ? error : output)
+          Apstrings::log_error(" Format error in #{file}: #{message}")
+        end
+    }
+
+    if masterFile != nil
+        Open3.popen3("plutil",  "-lint" ,"#{masterFile}") {|i, o, e, t| 
+        if t.value.exitstatus == 0
+          valid_master = true
+        else
+          valid_master = false
+          error =  e.gets
+          output = o.gets
+          message = (error != nil  ? error : output)
+          Apstrings::log_error(" Format error in #{file}: #{message}")
+        end
+      }
+    end
+
+    if valid_strings && valid_master
+      Validator::validate(file,masterFile)
+    end
 	end
 
   def self.log_info(message)

data/lib/apstrings/strings_validator.rb

@@ -25,9 +25,13 @@ module Apstrings
 			if valid_master && valid_file &&  no_missing_key
 				# Log::info("Yeah! 🍻 🍻 ")
 				return true
-			else
-				Log::error("Oh no! Invalid file.")
-				return false
+			else if valid_master && valid_file && !no_missing_key
+					Log::warn("Missing keys found.")
+					return true
+				else
+					Log::error("Oh no! Invalid file.")
+					return false
+				end
 			end
 		end
 

data/lib/apstrings/version.rb

@@ -1,3 +1,3 @@
 module Apstrings
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apstrings
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - JasonWorking
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: open3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An easy to use Apple dot strings file parser with encoding handled.
 email:
 - 331314708@qq.com