apstrings 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f211318b7b0d10e396c16c3f5a80bdade2fd6205
-  data.tar.gz: 32e09323994dae20baa264f71e481b0552e4b299
+  metadata.gz: be7cedd2dbf8bae610fa2e41cf566a941ff5cd94
+  data.tar.gz: 910dd14e5e9b48a8a9beb5f1255246a4ee5ba619
 SHA512:
-  metadata.gz: 705060a13f5f761efee7f32252755f86a3abc942556b8a323c94feecbd7fae549085dd401665a787ef758366a4f510f02fe7e9bd00ce7b5f1b00a8e82d8533c2
-  data.tar.gz: ba524f9e6d0ceb84b140183661bbfa99a72d664a657a884c661919124dd4116eaec9465e897ab01863c98366ce13d54173b1187932eaf6c49c21a5da7fd18d0e
+  metadata.gz: 85f48b5b8088f7f12cacf27f9971d6274747cc2c0a21c870d1ac6d199a1dbd0a128ea30e8cf7b1bfe5d7c2639e4d248ed5ae6a69936cbf10d7028332d3ccb37e
+  data.tar.gz: c41ea1800c06125f7eb7ca3493646c3182918329f87d67853c56f4198674160ba2d683dac7dc0d302df9418a7bb09b87dec4bf3d60fe41fcca74147c2bf81446

data/apstrings.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["331314708@qq.com"]
 
   spec.summary       = %q{Apple dot strings file parser.}
-  spec.description   = %q{An Apple dot strings file parser with encoding handled.}
+  spec.description   = %q{An easy to use Apple dot strings file parser with encoding handled.}
   spec.homepage      = "https://github.com/JasonWorking"
   spec.license       = "MIT"
 
@@ -20,7 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "colorize"
+  spec.add_development_dependency "true"
+  spec.add_development_dependency "colored"
   spec.add_development_dependency "json"
 
   

data/bin/apstrings

@@ -1,7 +1,11 @@
 #!/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
@@ -21,17 +25,23 @@ Dir.glob(File.join("**", "*.strings")) { |file|
  }
 
 success = true
+any_file = false
 files_to_validate["files"].each { |file|
+	any_file = true
 	if !Apstrings::validate(file,files_to_validate["master"])
 		success = false
 	end
  }
 
-if success
-	p "Success, well done!"
+if success && any_file
+	Apstrings::log_info("Success, well done! 🍻 🍻")
+	exit(0)
+else if !any_file
+	Apstrings::log_info("Nothing to validate.")
 	exit(0)
 else
-	p "Failed: You'd better know what r u doing..."
+	Apstrings::log_error("Failed: You'd better know what u r doing...")
 	exit(1)
 end
+end
  

data/lib/apstrings/logger.rb

@@ -1,6 +1,6 @@
 
 module Apstrings
-	require 'colorize'
+	require 'colored'
 	class Log 
 		def self.info(message)
 			puts "INFO : #{message}".green

data/lib/apstrings/strings_validator.rb

@@ -7,7 +7,7 @@ module Apstrings
 
 		def self.validate(file,masterFile)
 			@master = nil
-			puts "apstrings: start validate  strings file  ..."
+			# puts "apstrings: start validate  strings file  ..."
 			if nil == masterFile
 				Log::warn("No master file provided, validating file format for #{file} only ...")
 			else
@@ -23,7 +23,7 @@ module Apstrings
 			end
 			
 			if valid_master && valid_file &&  no_missing_key
-				Log::info("Yeah! 🍻 🍻 ")
+				# Log::info("Yeah! 🍻 🍻 ")
 				return true
 			else
 				Log::error("Oh no! Invalid file.")
@@ -33,7 +33,7 @@ module Apstrings
 
 		def self.validate_format(file)
 			is_valid = true
-			puts "apstrings: start validate format for #{file} ..."
+			# puts "apstrings: start validate format for #{file} ..."
 			dup_keys_in_file = Validator::validate_duplicates(file)
 			mismatchs_in_file = Validator::validate_special_characters(file)
 			if nil != dup_keys_in_file && !dup_keys_in_file.empty?
@@ -56,7 +56,7 @@ module Apstrings
 		end
 
 		def self.validate_missing(file,masterFile)
-			puts "apstrings: checking missing keys for #{file}..."
+			# puts "apstrings: checking missing keys for #{file}..."
 			sf = Validator::paredFile(file)
 			sf_masterFile = Validator::paredFile(masterFile)
 			no_missing = true
@@ -71,7 +71,7 @@ module Apstrings
 		end
 
 		def self.validate_duplicates(file)
-			puts "apstrings: checking dup-keys for #{file}..."
+			# puts "apstrings: checking dup-keys for #{file}..."
 			sf = Validator::paredFile(file)
 			sf.keys.detect {
 				|e| sf.keys.count(e) > 1
@@ -80,7 +80,7 @@ module Apstrings
 
 
 		def self.validate_special_characters(file)
-			puts "apstrings: checking syntax for #{file}..."
+			# puts "apstrings: checking syntax for #{file}..."
 			sf = Validator::paredFile(file)
 			variables_regex = /%[hlqLztj]?[@%dDuUxXoOfeEgGcCsSpaAF]/
 			mismatchs = []

data/lib/apstrings/tester.rb

@@ -23,4 +23,4 @@ files_to_validate["files"].each { |file|
 	end
  }
 
- p success ? "Success, well done!" : "Failed: You'd better know what r u doing..."
+ p success ? Apstrings::log_info("Success, well done!") :  Apstrings::log_error("Failed: You'd better know what r u doing...")

data/lib/apstrings/version.rb

@@ -1,3 +1,3 @@
 module Apstrings
-  VERSION = "0.2.7"
+  VERSION = "0.3.0"
 end

data/lib/apstrings.rb

@@ -4,6 +4,7 @@ module Apstrings
 require 'apstrings/reader'
 require 'apstrings/strings_parser'
 require 'apstrings/strings_validator'
+require 'apstrings/logger'
 
   # Public
 	def self.parse(file)
@@ -15,9 +16,21 @@ require 'apstrings/strings_validator'
 		Reader.read(file)
 	end
 
-  	def self.validate(file,masterFile = nil)
-  		Validator::validate(file,masterFile)
-  	end
+	def self.validate(file,masterFile = nil)
+		Validator::validate(file,masterFile)
+	end
+
+  def self.log_info(message)
+    Log::info(message)
+  end
+
+  def self.log_warning(message)
+    Log::warn(message)
+  end
+
+  def self.log_error(message)
+    Log::error(message)
+  end
   	
 end
 

metadata

@@ -1,83 +1,96 @@
 --- !ruby/object:Gem::Specification
 name: apstrings
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - JasonWorking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: 'true'
   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'
+- !ruby/object:Gem::Dependency
+  name: colored
+  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'
 - !ruby/object:Gem::Dependency
   name: json
   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 Apple dot strings file parser with encoding handled.
+description: An easy to use Apple dot strings file parser with encoding handled.
 email:
 - 331314708@qq.com
 executables:
 - apstrings
 - console
-- setup
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -86,7 +99,6 @@ files:
 - apstrings.gemspec
 - bin/apstrings
 - bin/console
-- bin/setup
 - lib/apstrings.rb
 - lib/apstrings/dot_string_file.rb
 - lib/apstrings/kv_pair.rb
@@ -107,17 +119,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.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Apple dot strings file parser.

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here