apstrings 0.2.7 → 0.3.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/apstrings.gemspec +3 -2
- data/bin/apstrings +13 -3
- data/lib/apstrings/logger.rb +1 -1
- data/lib/apstrings/strings_validator.rb +6 -6
- data/lib/apstrings/tester.rb +1 -1
- data/lib/apstrings/version.rb +1 -1
- data/lib/apstrings.rb +16 -3
- metadata +31 -19
- data/bin/setup +0 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: be7cedd2dbf8bae610fa2e41cf566a941ff5cd94
|
4
|
+
data.tar.gz: 910dd14e5e9b48a8a9beb5f1255246a4ee5ba619
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 85f48b5b8088f7f12cacf27f9971d6274747cc2c0a21c870d1ac6d199a1dbd0a128ea30e8cf7b1bfe5d7c2639e4d248ed5ae6a69936cbf10d7028332d3ccb37e
|
7
|
+
data.tar.gz: c41ea1800c06125f7eb7ca3493646c3182918329f87d67853c56f4198674160ba2d683dac7dc0d302df9418a7bb09b87dec4bf3d60fe41fcca74147c2bf81446
|
data/apstrings.gemspec
CHANGED
@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
|
|
10
10
|
spec.email = ["331314708@qq.com"]
|
11
11
|
|
12
12
|
spec.summary = %q{Apple dot strings file parser.}
|
13
|
-
spec.description = %q{An Apple dot strings file parser with encoding handled.}
|
13
|
+
spec.description = %q{An easy to use Apple dot strings file parser with encoding handled.}
|
14
14
|
spec.homepage = "https://github.com/JasonWorking"
|
15
15
|
spec.license = "MIT"
|
16
16
|
|
@@ -20,7 +20,8 @@ Gem::Specification.new do |spec|
|
|
20
20
|
|
21
21
|
spec.add_development_dependency "bundler", "~> 1.10"
|
22
22
|
spec.add_development_dependency "rake", "~> 10.0"
|
23
|
-
spec.add_development_dependency "
|
23
|
+
spec.add_development_dependency "true"
|
24
|
+
spec.add_development_dependency "colored"
|
24
25
|
spec.add_development_dependency "json"
|
25
26
|
|
26
27
|
|
data/bin/apstrings
CHANGED
@@ -1,7 +1,11 @@
|
|
1
1
|
#!/usr/bin/env ruby
|
2
2
|
|
3
|
+
require "bundler/setup"
|
3
4
|
require "apstrings"
|
4
5
|
|
6
|
+
# You can add fixtures and/or initialization code here to make experimenting
|
7
|
+
# with your gem easier. You can also use a different console, if you like.
|
8
|
+
|
5
9
|
# (If you use this, don't forget to add pry to your Gemfile!)
|
6
10
|
# require "pry"
|
7
11
|
# Pry.start
|
@@ -21,17 +25,23 @@ Dir.glob(File.join("**", "*.strings")) { |file|
|
|
21
25
|
}
|
22
26
|
|
23
27
|
success = true
|
28
|
+
any_file = false
|
24
29
|
files_to_validate["files"].each { |file|
|
30
|
+
any_file = true
|
25
31
|
if !Apstrings::validate(file,files_to_validate["master"])
|
26
32
|
success = false
|
27
33
|
end
|
28
34
|
}
|
29
35
|
|
30
|
-
if success
|
31
|
-
|
36
|
+
if success && any_file
|
37
|
+
Apstrings::log_info("Success, well done! 🍻 🍻")
|
38
|
+
exit(0)
|
39
|
+
else if !any_file
|
40
|
+
Apstrings::log_info("Nothing to validate.")
|
32
41
|
exit(0)
|
33
42
|
else
|
34
|
-
|
43
|
+
Apstrings::log_error("Failed: You'd better know what u r doing...")
|
35
44
|
exit(1)
|
36
45
|
end
|
46
|
+
end
|
37
47
|
|
data/lib/apstrings/logger.rb
CHANGED
@@ -7,7 +7,7 @@ module Apstrings
|
|
7
7
|
|
8
8
|
def self.validate(file,masterFile)
|
9
9
|
@master = nil
|
10
|
-
puts "apstrings: start validate strings file ..."
|
10
|
+
# puts "apstrings: start validate strings file ..."
|
11
11
|
if nil == masterFile
|
12
12
|
Log::warn("No master file provided, validating file format for #{file} only ...")
|
13
13
|
else
|
@@ -23,7 +23,7 @@ module Apstrings
|
|
23
23
|
end
|
24
24
|
|
25
25
|
if valid_master && valid_file && no_missing_key
|
26
|
-
Log::info("Yeah! 🍻 🍻 ")
|
26
|
+
# Log::info("Yeah! 🍻 🍻 ")
|
27
27
|
return true
|
28
28
|
else
|
29
29
|
Log::error("Oh no! Invalid file.")
|
@@ -33,7 +33,7 @@ module Apstrings
|
|
33
33
|
|
34
34
|
def self.validate_format(file)
|
35
35
|
is_valid = true
|
36
|
-
puts "apstrings: start validate format for #{file} ..."
|
36
|
+
# puts "apstrings: start validate format for #{file} ..."
|
37
37
|
dup_keys_in_file = Validator::validate_duplicates(file)
|
38
38
|
mismatchs_in_file = Validator::validate_special_characters(file)
|
39
39
|
if nil != dup_keys_in_file && !dup_keys_in_file.empty?
|
@@ -56,7 +56,7 @@ module Apstrings
|
|
56
56
|
end
|
57
57
|
|
58
58
|
def self.validate_missing(file,masterFile)
|
59
|
-
puts "apstrings: checking missing keys for #{file}..."
|
59
|
+
# puts "apstrings: checking missing keys for #{file}..."
|
60
60
|
sf = Validator::paredFile(file)
|
61
61
|
sf_masterFile = Validator::paredFile(masterFile)
|
62
62
|
no_missing = true
|
@@ -71,7 +71,7 @@ module Apstrings
|
|
71
71
|
end
|
72
72
|
|
73
73
|
def self.validate_duplicates(file)
|
74
|
-
puts "apstrings: checking dup-keys for #{file}..."
|
74
|
+
# puts "apstrings: checking dup-keys for #{file}..."
|
75
75
|
sf = Validator::paredFile(file)
|
76
76
|
sf.keys.detect {
|
77
77
|
|e| sf.keys.count(e) > 1
|
@@ -80,7 +80,7 @@ module Apstrings
|
|
80
80
|
|
81
81
|
|
82
82
|
def self.validate_special_characters(file)
|
83
|
-
puts "apstrings: checking syntax for #{file}..."
|
83
|
+
# puts "apstrings: checking syntax for #{file}..."
|
84
84
|
sf = Validator::paredFile(file)
|
85
85
|
variables_regex = /%[hlqLztj]?[@%dDuUxXoOfeEgGcCsSpaAF]/
|
86
86
|
mismatchs = []
|
data/lib/apstrings/tester.rb
CHANGED
data/lib/apstrings/version.rb
CHANGED
data/lib/apstrings.rb
CHANGED
@@ -4,6 +4,7 @@ module Apstrings
|
|
4
4
|
require 'apstrings/reader'
|
5
5
|
require 'apstrings/strings_parser'
|
6
6
|
require 'apstrings/strings_validator'
|
7
|
+
require 'apstrings/logger'
|
7
8
|
|
8
9
|
# Public
|
9
10
|
def self.parse(file)
|
@@ -15,9 +16,21 @@ require 'apstrings/strings_validator'
|
|
15
16
|
Reader.read(file)
|
16
17
|
end
|
17
18
|
|
18
|
-
|
19
|
-
|
20
|
-
|
19
|
+
def self.validate(file,masterFile = nil)
|
20
|
+
Validator::validate(file,masterFile)
|
21
|
+
end
|
22
|
+
|
23
|
+
def self.log_info(message)
|
24
|
+
Log::info(message)
|
25
|
+
end
|
26
|
+
|
27
|
+
def self.log_warning(message)
|
28
|
+
Log::warn(message)
|
29
|
+
end
|
30
|
+
|
31
|
+
def self.log_error(message)
|
32
|
+
Log::error(message)
|
33
|
+
end
|
21
34
|
|
22
35
|
end
|
23
36
|
|
metadata
CHANGED
@@ -1,83 +1,96 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: apstrings
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.3.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- JasonWorking
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-10-
|
11
|
+
date: 2015-10-02 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- -
|
17
|
+
- - ~>
|
18
18
|
- !ruby/object:Gem::Version
|
19
19
|
version: '1.10'
|
20
20
|
type: :development
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- -
|
24
|
+
- - ~>
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: '1.10'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: rake
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
|
-
- -
|
31
|
+
- - ~>
|
32
32
|
- !ruby/object:Gem::Version
|
33
33
|
version: '10.0'
|
34
34
|
type: :development
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
|
-
- -
|
38
|
+
- - ~>
|
39
39
|
- !ruby/object:Gem::Version
|
40
40
|
version: '10.0'
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
|
-
name:
|
42
|
+
name: 'true'
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
|
-
- -
|
45
|
+
- - '>='
|
46
46
|
- !ruby/object:Gem::Version
|
47
47
|
version: '0'
|
48
48
|
type: :development
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
|
-
- -
|
52
|
+
- - '>='
|
53
|
+
- !ruby/object:Gem::Version
|
54
|
+
version: '0'
|
55
|
+
- !ruby/object:Gem::Dependency
|
56
|
+
name: colored
|
57
|
+
requirement: !ruby/object:Gem::Requirement
|
58
|
+
requirements:
|
59
|
+
- - '>='
|
60
|
+
- !ruby/object:Gem::Version
|
61
|
+
version: '0'
|
62
|
+
type: :development
|
63
|
+
prerelease: false
|
64
|
+
version_requirements: !ruby/object:Gem::Requirement
|
65
|
+
requirements:
|
66
|
+
- - '>='
|
53
67
|
- !ruby/object:Gem::Version
|
54
68
|
version: '0'
|
55
69
|
- !ruby/object:Gem::Dependency
|
56
70
|
name: json
|
57
71
|
requirement: !ruby/object:Gem::Requirement
|
58
72
|
requirements:
|
59
|
-
- -
|
73
|
+
- - '>='
|
60
74
|
- !ruby/object:Gem::Version
|
61
75
|
version: '0'
|
62
76
|
type: :development
|
63
77
|
prerelease: false
|
64
78
|
version_requirements: !ruby/object:Gem::Requirement
|
65
79
|
requirements:
|
66
|
-
- -
|
80
|
+
- - '>='
|
67
81
|
- !ruby/object:Gem::Version
|
68
82
|
version: '0'
|
69
|
-
description: An Apple dot strings file parser with encoding handled.
|
83
|
+
description: An easy to use Apple dot strings file parser with encoding handled.
|
70
84
|
email:
|
71
85
|
- 331314708@qq.com
|
72
86
|
executables:
|
73
87
|
- apstrings
|
74
88
|
- console
|
75
|
-
- setup
|
76
89
|
extensions: []
|
77
90
|
extra_rdoc_files: []
|
78
91
|
files:
|
79
|
-
-
|
80
|
-
-
|
92
|
+
- .gitignore
|
93
|
+
- .travis.yml
|
81
94
|
- CODE_OF_CONDUCT.md
|
82
95
|
- Gemfile
|
83
96
|
- LICENSE.txt
|
@@ -86,7 +99,6 @@ files:
|
|
86
99
|
- apstrings.gemspec
|
87
100
|
- bin/apstrings
|
88
101
|
- bin/console
|
89
|
-
- bin/setup
|
90
102
|
- lib/apstrings.rb
|
91
103
|
- lib/apstrings/dot_string_file.rb
|
92
104
|
- lib/apstrings/kv_pair.rb
|
@@ -107,17 +119,17 @@ require_paths:
|
|
107
119
|
- lib
|
108
120
|
required_ruby_version: !ruby/object:Gem::Requirement
|
109
121
|
requirements:
|
110
|
-
- -
|
122
|
+
- - '>='
|
111
123
|
- !ruby/object:Gem::Version
|
112
124
|
version: '0'
|
113
125
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
114
126
|
requirements:
|
115
|
-
- -
|
127
|
+
- - '>='
|
116
128
|
- !ruby/object:Gem::Version
|
117
129
|
version: '0'
|
118
130
|
requirements: []
|
119
131
|
rubyforge_project:
|
120
|
-
rubygems_version: 2.
|
132
|
+
rubygems_version: 2.0.14
|
121
133
|
signing_key:
|
122
134
|
specification_version: 4
|
123
135
|
summary: Apple dot strings file parser.
|