ambient-xcode 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aa28492d2fc79beba415905f23fa9c2722ad2b4
-  data.tar.gz: 7248bebe4500754766259c4b62aeab11c557523b
+  metadata.gz: 1bd28337f7264024fc33327b9bbf6532f3d83e6d
+  data.tar.gz: 55d2e05c9978c8cfece5859c1bf5cc5a32b64482
 SHA512:
-  metadata.gz: 85f740558e295eef751f7f6733e22e25cf3c11940af934d181f45b91098eb84f0d8ee55da851d296c42fa6cf0b3ada174256fd4ca5ee91f260dbfea56b48ba68
-  data.tar.gz: 82c0d6752fb83e4575b387af0dc56fb8c46427966e7b391dcd2f71bc58567d9f5db3d75b3805d8266515a19bed96521592e6f878fb96e8cf4c1e7d9be961a8a1
+  metadata.gz: ade3993664e0f19b09c891cfc993d39829038a1fb1286a7a75a97f749dcf80d5a660770108f558a8acc9b92b7975cfcad3d6278ff6ac191588bb95f2ab892762
+  data.tar.gz: d0acaf3d838ef1266ebfb9a6fe815bdb3aba2b522c81c38d3ab8d5e929ebd38c7ecf2d52530d4b5f6b5eb82275b41a3f4bfd85ab884894d14718bb7fc67229e4

data/ambient-xcode.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'ambient-xcode'
-  gem.version       = '0.4.0'
+  gem.version       = '0.5.0'
   gem.authors       = ['Daniel Green']
   gem.email         = ['dan2552@gmail.com']
   gem.description   = %q{CLI for configuring Xcode projects from a Ruby file.}

data/lib/ambient.rb

@@ -31,7 +31,8 @@ module Ambient
     @project_helper ||= ProjectHelper.new
   end
 
-  def set_parent_target(target, child, parent)
+  def set_parent_scheme(target: nil, child: nil, parent: nil)
+    target = target || :all
     @parents[target] ||= {}
     @parents[target][child] = parent
   end
@@ -75,6 +76,7 @@ module Ambient
     reset_project_to_defaults if @use_defaults
     reset_targets_to_defaults if @use_defaults
     reset_capabilites_to_defaults if @use_defaults
+    load_in_parent_scheme_values
     process_project_options
     process_scheme_options
     process_shared_target_options
@@ -116,7 +118,6 @@ module Ambient
 
   def process_target_options
     puts "applying ambient target settings"
-    load_in_parent_target_values
     project_helper.process_target_options(@target_options)
   end
 
@@ -130,13 +131,19 @@ module Ambient
     project_helper.process_development_teams(@development_teams)
   end
 
-  def load_in_parent_target_values
+  def load_in_parent_scheme_values
     @parents.each do |target, parents|
       parents.each do |child, parent|
         if parent
-          options = @target_options[target]
-          child_options = options[child]
-          parent_options = options[parent]
+          if target == :all
+            puts "Identified #{child} as a child of #{parent}"
+            child_options = @scheme_options[child]
+            parent_options = @scheme_options[parent]
+          else
+            target_options = @target_options[target]
+            child_options = target_options[child]
+            parent_options = target_options[parent]
+          end
           child_options.merge!(parent_options) { |_, child, _| child }
         end
       end

data/lib/dsl.rb

@@ -106,15 +106,19 @@ class SchemeScope
     @name = name
     @parent = parent
 
-    child = name
-
-    if @target
-      Ambient.configure { set_parent_target(target.name, child, parent) }
+    Ambient.configure do
+      set_parent_scheme(
+        target: target && target.name,
+        child: name,
+        parent: parent
+      )
     end
   end
 
   def configure(&block)
-    instance_eval(&block)
+    if block
+      instance_eval(&block)
+    end
   end
 
   def option(option_name, value)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ambient-xcode
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Daniel Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj