xcodeproj 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d69e019d682b09834105316249157ff2f8e8ce16
-  data.tar.gz: 070eebafd685abfdcc50312ef3276c8e37e4aa95
+  metadata.gz: d90a203dc3522c9997eb87aae3f6f1a29b4bebdf
+  data.tar.gz: e62db789786883b44ec174e910b4f1ba97bdd384
 SHA512:
-  metadata.gz: 99515f622edb41f755d5a0212c656393c4e7bd7cbf6c6fc732cccc847ade8d8ce342cb0b47ff34be1be44625ebc43c5f77f489fd652bdea9df3d7998ce9d0ae3
-  data.tar.gz: 7a686f38cd6f43a1c0ab58037785e9e953444a728c40115b5df3ebae58eed82892c7742f085118ba50355094fae3090f96e7021739c6077153f214b90fdd5278
+  metadata.gz: d41cd07ebcd1168337125625243e283371b346def515a290af19cbc2b5c8e360c4612b5f0021f8dabe45bd9f8190537a0a55bb4bdeb9abbdab56ec2a0fe1ec27
+  data.tar.gz: d40a0254fdb0b7bbef8e63ed5189f8eaa04b93a0e3f51c3e597db5f59577e7dbe158af2910e6fc379a0d279e9a2b90fbad9fe872a3c28eadf1a9c7e8fc879a0c

data/lib/xcodeproj/config.rb

@@ -134,6 +134,15 @@ module Xcodeproj
       inherited = %w($(inherited) ${inherited}).freeze
       result.reject! { |_, v| inherited.any? { |i| i == v.to_s.strip } }
 
+      result = @includes.map do |incl|
+        path = File.expand_path(incl, @filepath.dirname)
+        if File.readable? path
+          Xcodeproj::Config.new(path).to_hash
+        else
+          {}
+        end
+      end.inject(&:merge).merge(result) unless @filepath.nil? || @includes.empty?
+
       if prefix
         Hash[result.map { |k, v| [prefix + k, v] }]
       else
@@ -237,8 +246,10 @@ module Xcodeproj
     #
     def extract_hash(argument)
       if argument.respond_to? :read
+        @filepath = Pathname.new(argument.to_path)
         hash_from_file_content(argument.read)
       elsif File.readable?(argument.to_s)
+        @filepath = Pathname.new(argument.to_s)
         hash_from_file_content(File.read(argument))
       else
         argument

data/lib/xcodeproj/gem_version.rb

@@ -1,5 +1,5 @@
 module Xcodeproj
   # The version of the xcodeproj gem.
   #
-  VERSION = '1.5.2'.freeze unless defined? Xcodeproj::VERSION
+  VERSION = '1.5.3'.freeze unless defined? Xcodeproj::VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-24 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList