xcake 0.6.10 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c1a2d045af199b1bebd5d440f182c8b740dba1b
-  data.tar.gz: e640ef5e9a0b208cb58c089db83dd76f50e8ef6f
+  metadata.gz: 19ac7ea3c7fb86b05306b60abda662b9588702db
+  data.tar.gz: 1b1325aaa8b44c9d92ade0c41b278cdcd30df48f
 SHA512:
-  metadata.gz: bfc816b350549d4b5fb8ffd9ce0a59259a32e033f44a14b69f88e9fc7621f6a4286d80da0a215455fbedceec39352129ef85ef3dc32e020a37c2c83c127bf02b
-  data.tar.gz: c139fd841aafc15963dc9f57422dcb2a36d657c7d4f2ba4c13b3935b30bda4d17a06d44b736b5ad2a22c75e45c45fd96fe99f370f2d0f766cf3ec084562849ee
+  metadata.gz: d7ff9602e680fe413c9b35361cddda11c41d2953ddade67911a13d3a27bdd5b9f223a12fe189899dfc67aedccbc0a793b3c2caac5440ef9c447fdac24ceb48c7
+  data.tar.gz: fceb353bfe8891232b7b98407e24300dabbba7367d859ae9d36ff4fad5c31b3bcc5a0c72406d6042ed50a52feb987765576fece432fd589b85d740a0164823a8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v0.6.11
+=======
+- Fixes issues with system frameworks when inherited configurations.
+
 v0.6.10
 =======
 - Fixes race-condition where configurations weren't setup correctly.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xcake (0.6.10)
+    xcake (0.6.11)
       claide (~> 0.9.1)
       hooks (~> 0.4.1)
       molinillo

data/lib/xcake/configurable.rb

@@ -15,97 +15,111 @@ module Xcake
 
     private
 
-    attr_accessor :all_configurations
+    attr_accessor :configurations
 
     public
 
-    attr_accessor :debug_configurations
-    attr_accessor :release_configurations
-
-    # @return [Array<Configuration>] list of configurations
+    # @return [Array<Configuration>] list of all configurations
     #
     def all_configurations
-      configurations = []
+      if @configurations.nil?
+        @configurations = []
 
-      if debug_configurations.empty?
-        configurations << debug_configuration("Debug")
-      else
-        configurations.concat(debug_configurations)
+        parent_configurable.all_configurations.each do |c|
+          configuration(c.name, c.type)
+        end if parent_configurable
       end
 
-      if release_configurations.empty?
-        configurations << release_configuration("Release")
-      else
-        configurations.concat(release_configurations)
-      end
-
-      configurations
+      @configurations
     end
 
-    # @return [Array<Configuration>] list of debug configurations
+    # @param [Array<Configuration>] new list of configurations to set
     #
-    def debug_configurations
-      @debug_configurations ||= []
+    def all_configurations=(configurations)
+      @configurations = configurations
     end
 
-    # @return [Array<Configuration>] list of release configurations
+    # @return [Array<Configuration>] list of configurations of a type
     #
-    def release_configurations
-      @release_configurations ||= []
+    def configurations_of_type(type)
+      all_configurations.select do |c|
+        c.type == type
+      end
     end
 
     # This either finds a release configuration
     # with the same name or creates one.
     #
+    # @deprecated Please use `configuration <name>, :debug` this
+    #             woll be removed in 0.7.0
+    #
     # @return [Configuration] the new or existing debug configuration
     #
     def debug_configuration(name = nil, &block)
-      build_configuration(:debug, name, &block)
+      configuration(name, :debug, &block)
     end
 
     # This either finds a release configuration
     # with the same name or creates one.
     #
+    # @deprecated Please use `configuration <name>, :release` this
+    #             woll be removed in 0.7.0
+    #
     # @return [Configuration] the new or existing release configuration
     #
     def release_configuration(name = nil, &block)
-      build_configuration(:release, name, &block)
+      configuration(name, :release, &block)
     end
 
-    private
+    # This either finds a configuration
+    # with the same name and type or creates one.
+    #
+    # @return [Configuration] the new or existing configuration
+    #
+    def configuration(name, type, &block)
 
-    def build_configuration(method, name, &block)
-      case method
-      when :debug
-        configuration_name = debug_configurations
-        default_settings = default_debug_settings
-      when :release
-        configuration_name = release_configurations
-        default_settings = default_release_settings
-      end
+      default_settings = default_settings_for_type(type)
+      configurations = configurations_of_type(type)
 
       if name.nil?
-        build_configuration = configuration_name.first
+        build_configuration = configurations.first
       else
-        build_configuration = configuration_name.detect do |c|
+        build_configuration = configurations.detect do |c|
           c.name == name.to_s
         end
       end
 
       if build_configuration.nil?
-        if name.nil?
-          name = method.to_s[0].upcase + method.to_s[1..-1]
-        end
+
+        name = type.to_s.capitalize if name.nil?
 
         build_configuration = Configuration.new(name) do |b|
+
+          b.type = type
           b.settings.merge!(default_settings)
+
           block.call(b) if block_given?
         end
 
-        configuration_name << build_configuration
+        all_configurations << build_configuration
       end
 
       build_configuration
     end
+
+    private
+
+    def parent_configurable
+      nil
+    end
+
+    def default_settings_for_type(type)
+      case type
+      when :debug
+        default_debug_settings
+      when :release
+        default_release_settings
+      end
+    end
   end
 end

data/lib/xcake/configuration.rb

@@ -14,10 +14,14 @@ module Xcake
 
     include Visitable
 
-    # @return [String>] the name of the configuration
+    # @return [String] the name of the configuration
     #
     attr_accessor :name
 
+    # @return [Symbol] the type of the configuration, either :debug or :release
+    #
+    attr_accessor :type
+
     # the settings for the configuration
     # this is what is used for the build settings
     # for the build configuration.

data/lib/xcake/project.rb

@@ -66,18 +66,7 @@ module Xcake
     #         the newly created target
     #
     def target(&block)
-      target = Target.new
-
-      # Make sure the target inherits the configurations from the project.
-      debug_configurations.each do |c|
-        target.debug_configuration c.name
-      end
-
-      release_configurations.each do |c|
-        target.release_configuration c.name
-      end
-
-      block.call(target) if block_given?
+      target = Target.new(project, &block)
 
       self.targets << target
       target

data/lib/xcake/target.rb

@@ -7,6 +7,10 @@ module Xcake
     include Configurable
     include Visitable
 
+    # @return [Project] the project for the target.
+    #
+    attr_accessor :project
+
     # @return [String] the name of the target.
     #
     attr_accessor :name
@@ -171,8 +175,11 @@ module Xcake
     #             t.name "test"
     #           end
     #
-    def initialize(&block)
-      self.build_phases = []
+    def initialize(project, &block)
+
+      @project = project
+      @build_phases = []
+
       block.call(self) if block_given?
     end
 
@@ -221,6 +228,10 @@ module Xcake
 
     #Configurable
 
+    def parent_configurable
+      @project
+    end
+
     def default_settings
       {
         "INFOPLIST_FILE" => "#{name}/Supporting Files/Info.plist"

data/lib/xcake/version.rb

@@ -1,3 +1,3 @@
 module Xcake
-  VERSION = "0.6.10".freeze
+  VERSION = "0.6.11".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcake
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.11
 platform: ruby
 authors:
 - James Campbell