xcodeproj 1.5.2 → 1.5.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/xcodeproj/config.rb +11 -0
- data/lib/xcodeproj/gem_version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d90a203dc3522c9997eb87aae3f6f1a29b4bebdf
|
|
4
|
+
data.tar.gz: e62db789786883b44ec174e910b4f1ba97bdd384
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d41cd07ebcd1168337125625243e283371b346def515a290af19cbc2b5c8e360c4612b5f0021f8dabe45bd9f8190537a0a55bb4bdeb9abbdab56ec2a0fe1ec27
|
|
7
|
+
data.tar.gz: d40a0254fdb0b7bbef8e63ed5189f8eaa04b93a0e3f51c3e597db5f59577e7dbe158af2910e6fc379a0d279e9a2b90fbad9fe872a3c28eadf1a9c7e8fc879a0c
|
data/lib/xcodeproj/config.rb
CHANGED
|
@@ -134,6 +134,15 @@ module Xcodeproj
|
|
|
134
134
|
inherited = %w($(inherited) ${inherited}).freeze
|
|
135
135
|
result.reject! { |_, v| inherited.any? { |i| i == v.to_s.strip } }
|
|
136
136
|
|
|
137
|
+
result = @includes.map do |incl|
|
|
138
|
+
path = File.expand_path(incl, @filepath.dirname)
|
|
139
|
+
if File.readable? path
|
|
140
|
+
Xcodeproj::Config.new(path).to_hash
|
|
141
|
+
else
|
|
142
|
+
{}
|
|
143
|
+
end
|
|
144
|
+
end.inject(&:merge).merge(result) unless @filepath.nil? || @includes.empty?
|
|
145
|
+
|
|
137
146
|
if prefix
|
|
138
147
|
Hash[result.map { |k, v| [prefix + k, v] }]
|
|
139
148
|
else
|
|
@@ -237,8 +246,10 @@ module Xcodeproj
|
|
|
237
246
|
#
|
|
238
247
|
def extract_hash(argument)
|
|
239
248
|
if argument.respond_to? :read
|
|
249
|
+
@filepath = Pathname.new(argument.to_path)
|
|
240
250
|
hash_from_file_content(argument.read)
|
|
241
251
|
elsif File.readable?(argument.to_s)
|
|
252
|
+
@filepath = Pathname.new(argument.to_s)
|
|
242
253
|
hash_from_file_content(File.read(argument))
|
|
243
254
|
else
|
|
244
255
|
argument
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: xcodeproj
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.5.
|
|
4
|
+
version: 1.5.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Eloy Duran
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-
|
|
11
|
+
date: 2017-10-24 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: CFPropertyList
|