xcake 0.8.13 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 922659236668f3f498562f2355111f765332f962
-  data.tar.gz: 38fdc71a060d82c42168b4950379193fcca38737
+SHA256:
+  metadata.gz: 798f479f92ab560e1c5cca364dad5368a8ccb082ba53a534133822d6fe68c3fe
+  data.tar.gz: 5a5d2e73f2856bab26dfb2a1acb5fa77054a1b3b48d47073a847f400a121354e
 SHA512:
-  metadata.gz: 99a37036e27cb624edb346a4bb911e7b78034a54d730d0e09934c712c070e6ce385b4eebfda2df60354eef117fadf49ff03e22a3e3a3c838e1dee835dde57856
-  data.tar.gz: 0f8527a7d02ba8466bae4969f741c892c209b0e118579677eac6bd7c4d7f36fa0dbecc9f69c6745bf6dbd20c611b0d69319cf1abd34ec10b7edcd24122bf5319
+  metadata.gz: 629a256181ebfcc5a51735f1d273430aaae9c0b6b17795c7742914e9852f23bdbe12ab360b38d6110e02666c5ad34d2c99346c519367690c17b409ebeb08c5b4
+  data.tar.gz: 14bc5caa9620adc2aa740d00ac9723c614b6015b7ef41cebe79dc8ece7c781310830ddb407b55b3c4194c71637daf620522c3e605140275aab125cc7c7030c9a

data/lib/xcake.rb

@@ -1,5 +1,4 @@
-require 'xcake/core_ext/array'
-require 'xcake/core_ext/object'
+require 'xcake/core_ext/class'
 require 'xcake/core_ext/string'
 
 require 'xcake/xcode/project'

data/lib/xcake/command/make.rb

@@ -7,9 +7,7 @@ module Xcake
       def run
         file_path = "#{Dir.pwd}/Cakefile"
 
-        unless File.exist?(file_path)
-          raise Xcake::Informative, "Couldn't find Cakefile"
-        end
+        raise Xcake::Informative, "Couldn't find Cakefile" unless File.exist?(file_path)
 
         EventHooks.run_hook :before_cakefile_read
         file_contents = File.read(file_path)

data/lib/xcake/constants.rb

@@ -11,10 +11,10 @@ module Xcake
         ]
       }.freeze,
       [:ios, :ui_test_bundle] => {
-        "LD_RUNPATH_SEARCH_PATHS" => [
-          "$(inherited)",
-          "@executable_path/Frameworks",
-          "@loader_path/Frameworks"
+        'LD_RUNPATH_SEARCH_PATHS' => [
+          '$(inherited)',
+          '@executable_path/Frameworks',
+          '@loader_path/Frameworks'
         ]
       }.freeze,
       [:osx, :unit_test_bundle] => {
@@ -25,10 +25,10 @@ module Xcake
         ]
       }.freeze,
       [:osx, :ui_test_bundle] => {
-        "LD_RUNPATH_SEARCH_PATHS" => [
-          "$(inherited)",
-          "@executable_path/../Frameworks",
-          "@loader_path/../Frameworks"
+        'LD_RUNPATH_SEARCH_PATHS' => [
+          '$(inherited)',
+          '@executable_path/../Frameworks',
+          '@loader_path/../Frameworks'
         ]
       }.freeze
     ).freeze
@@ -60,8 +60,8 @@ module Xcake
     #
     # @return [Hash] The common build settings
     #
-    def self.common_build_settings(type, platform = nil, deployment_target = nil, target_product_type = nil, language = :objc)
-      target_product_type = (PRODUCT_TYPE_UTI.find { |_, v| v == target_product_type } || [target_product_type || :application])[0]
+    def self.common_build_settings(type, platform = nil, deployment_target = nil, target_product_type = nil, language = :objc) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/LineLength
+      target_product_type = (PRODUCT_TYPE_UTI.find { |_, v| v == target_product_type } || [target_product_type || :application])[0] # rubocop:disable Metrics/LineLength
       common_settings = COMMON_BUILD_SETTINGS
 
       # Use intersecting settings for all key sets as base

data/lib/xcake/context.rb

@@ -14,8 +14,6 @@ module Xcake
     # The internal hash of native objects reference by their
     # related DSL object
     #
-    attr_accessor :object_hash
-
     def object_hash
       @object_hash ||= {}
     end

data/lib/xcake/context/xcodeproj_context.rb

@@ -7,7 +7,7 @@ module Xcake
 
     attr_accessor :project
 
-    def create_object_for(dsl_object)
+    def create_object_for(dsl_object) # rubocop:disable Metrics/CyclomaticComplexity
       case dsl_object
       when BuildPhase
         create_object_for_build_phase(dsl_object)
@@ -28,17 +28,14 @@ module Xcake
       @project.new(build_phase.build_phase_type)
     end
 
-    def create_object_for_build_rule(build_rule)
+    def create_object_for_build_rule(_build_rule)
       @project.new(Xcodeproj::Project::Object::PBXBuildRule)
     end
 
     def create_object_for_project(project)
-      
       project_path = "./#{project.name}.xcodeproj"
-      
-      if File.exist?(project_path)
-        FileUtils.remove_dir(project_path)
-      end
+
+      FileUtils.remove_dir(project_path) if File.exist?(project_path)
 
       @project = Xcode::Project.new(project_path, true)
       @project.setup_for_xcake
@@ -53,7 +50,7 @@ module Xcake
       @project.new_configuration(configuration)
     end
 
-    def create_object_for_scheme(scheme)
+    def create_object_for_scheme(_scheme)
       Xcode::Scheme.new
     end
 

data/lib/xcake/core_ext/class.rb

@@ -0,0 +1,14 @@
+module Xcake
+  module CoreExtensions
+    # @example  Including in a class
+    #           Class.send(:include, Xcake::CoreExtensions::ClassDescendants) # done with send because of old ruby versions
+    #
+    module ClassDescendants
+      # Returns all descendants of a class
+      #
+      def descendants
+        ObjectSpace.each_object(singleton_class).select { |klass| klass < self }
+      end
+    end
+  end
+end

data/lib/xcake/dependency_provider.rb

@@ -7,9 +7,9 @@ module Xcake
     def initialize(dependency_class)
       plugins = dependency_class.load_plugins
 
-      @dependency_graph = plugins.map do |p|
-        [p, p.dependencies]
-      end.to_h
+      @dependency_graph = plugins.each_with_object({}) do |p, hash|
+        hash[p] = p.dependencies
+      end
     end
 
     def tsort_each_node(&block)

data/lib/xcake/dsl/build_phase/copy_files_build_phase.rb

@@ -29,9 +29,7 @@ module Xcake
       @files.each do |file|
         file_reference = context.file_reference_for_path(file)
         build_file = native_build_phase.add_file_reference(file_reference)
-        if code_sign
-          build_file.settings = { 'ATTRIBUTES' => ['CodeSignOnCopy'] }
-        end
+        build_file.settings = { 'ATTRIBUTES' => ['CodeSignOnCopy'] } if code_sign
       end
     end
 

data/lib/xcake/dsl/build_phase/shell_script_build_phase.rb

@@ -8,6 +8,12 @@ module Xcake
     # String coataining the contents of the script to run
     attr_accessor :script
 
+    # input/output paths
+    attr_accessor :input_paths
+    attr_accessor :output_paths
+    attr_accessor :input_file_list_paths
+    attr_accessor :output_file_list_paths
+
     def build_phase_type
       Xcodeproj::Project::Object::PBXShellScriptBuildPhase
     end
@@ -15,6 +21,10 @@ module Xcake
     def configure_native_build_phase(native_build_phase, _context)
       native_build_phase.name = name
       native_build_phase.shell_script = script.strip_heredoc
+      native_build_phase.input_paths = input_paths || []
+      native_build_phase.output_paths = output_paths || []
+      native_build_phase.input_file_list_paths = input_file_list_paths || []
+      native_build_phase.output_file_list_paths = output_file_list_paths || []
     end
 
     def to_s

data/lib/xcake/dsl/build_rule.rb

@@ -55,10 +55,10 @@ module Xcake
     #
     def configure_native_build_rule(native_build_rule, _context)
       native_build_rule.name = name
-      native_build_rule.compiler_spec = "com.apple.compilers.proxy.script"
+      native_build_rule.compiler_spec = 'com.apple.compilers.proxy.script'
       native_build_rule.file_type = file_type
       native_build_rule.script = script.strip_heredoc
-      if output_files_compiler_flags.empty? then
+      if output_files_compiler_flags.empty?
         output_files.each do |file|
           native_build_rule.add_output_file(file)
         end

data/lib/xcake/dsl/configurable.rb

@@ -39,9 +39,11 @@ module Xcake
     private
 
     def copy_parent_configurations
+      return unless parent_configurable
+
       parent_configurable.all_configurations.each do |c|
         configuration(c.name, c.type)
-      end if parent_configurable
+      end
     end
 
     public
@@ -93,13 +95,13 @@ module Xcake
       default_settings = default_settings_for_type(type)
       configurations = configurations_of_type(type)
 
-      if name.nil?
-        build_configuration = configurations.first
-      else
-        build_configuration = configurations.detect do |c|
-          c.name == name.to_s
-        end
-      end
+      build_configuration = if name.nil?
+                              configurations.first
+                            else
+                              configurations.detect do |c|
+                                c.name == name.to_s
+                              end
+                            end
 
       if build_configuration.nil?
 

data/lib/xcake/dsl/configuration/sugar.rb

@@ -17,7 +17,7 @@ module Xcake
     #
     # @example Using Supported Devices
     #
-    #          Target.new do |t|
+    #          Target.new(project) do |t|
     #             t.all_configurations.each do |c|
     #                c.supported_devices = :ipad_only
     #             end

data/lib/xcake/dsl/project.rb

@@ -63,7 +63,7 @@ module Xcake
     #         the newly created target
     #
     def target(&block)
-      target = Target.new(&block)
+      target = Target.new(self, &block)
       targets << target
       target
     end

data/lib/xcake/dsl/project/hooks.rb

@@ -5,6 +5,10 @@ module Xcake
     include Hooks
     include Hooks::InstanceHooks
 
+    # Defines hook which is ran before project is saved.
+    #
+    define_hooks :before_save
+
     # Defines hook which is ran after project is saved.
     #
     define_hooks :after_save

data/lib/xcake/dsl/project/sugar.rb

@@ -60,6 +60,10 @@ module Xcake
         t.type = :ui_test_bundle
         configure_test_target_for_host_target(t, host_target)
 
+        t.all_configurations.each do |c|
+          c.settings['TEST_TARGET_NAME'] = host_target.name
+        end
+
         yield(t) if block_given?
       end
     end
@@ -89,26 +93,24 @@ module Xcake
     private
 
     def configure_test_target_for_host_target(test_target, host_target)
-      
       test_target.target_dependencies << host_target
       test_target.platform = host_target.platform
       test_target.deployment_target = host_target.deployment_target
       test_target.language = host_target.language
 
-      if host_target.type == :application
-        test_target.all_configurations.each do |c|
-          if test_target.type == :ui_test_bundle
-            # Do nothing as they break UITests
-            # For more details https://github.com/jcampbell05/xcake/issues/115
-          else
-            c.settings["BUNDLE_LOADER"] = "$(TEST_HOST)"
-            if host_target.platform == :osx
-              c.settings["TEST_HOST"] = "$(BUILT_PRODUCTS_DIR)/#{host_target.name}.app/Contents/MacOS/#{host_target.name}"
-            else
-              c.settings["TEST_HOST"] = "$(BUILT_PRODUCTS_DIR)/#{host_target.name}.app/#{host_target.name}"
-            end
-          end
-        end
+      return unless host_target.type == :application
+
+      test_target.all_configurations.each do |c|
+        # Do nothing as they break UITests
+        # For more details https://github.com/jcampbell05/xcake/issues/115
+        next if test_target.type == :ui_test_bundle
+
+        c.settings['BUNDLE_LOADER'] = '$(TEST_HOST)'
+        c.settings['TEST_HOST'] = if host_target.platform == :osx
+                                    "$(BUILT_PRODUCTS_DIR)/#{host_target.name}.app/Contents/MacOS/#{host_target.name}"
+                                  else
+                                    "$(BUILT_PRODUCTS_DIR)/#{host_target.name}.app/#{host_target.name}"
+                                  end
       end
     end
 

data/lib/xcake/dsl/scheme.rb

@@ -7,13 +7,13 @@ module Xcake
     include Visitable
 
     # The name for the scheme
-    # 
+    #
     attr_accessor :name
 
     # The configuration to use when testing
     #
     # Defaults to "Debug"
-    # 
+    #
     attr_accessor :test_configuration
 
     # The configuration to use when launching
@@ -41,7 +41,6 @@ module Xcake
     attr_accessor :archive_configuration
 
     def initialize(name)
-
       @name = name
       @test_configuration = 'Debug'
       @launch_configuration = 'Debug'

data/lib/xcake/dsl/target.rb

@@ -136,7 +136,7 @@ module Xcake
     #
     #     spec.include_files = "Classes/**/*.{h,m}"
     #
-    attr_accessor :include_files
+    attr_writer :include_files
 
     # @return [Array or String] files to exclude for the target.
     #                           Supports regular expressions
@@ -158,7 +158,7 @@ module Xcake
     #
     #    spec.system_frameworks = ["Foundation"]
     #
-    attr_accessor :system_frameworks
+    attr_writer :system_frameworks
 
     # @return [Array<String>] system libraries to include for the target
     #
@@ -182,16 +182,19 @@ module Xcake
     #
     attr_accessor :schemes
 
+    # @param    [Project] project
+    #           the project the target belongs to.
+    #
     # @param    [Proc] block
     #           an optional block that configures the target through the DSL.
     #
     # @example  Creating a Target.
     #
-    #           Target.new do |t|
+    #           Target.new(project) do |t|
     #             t.name "test"
     #           end
     #
-    def initialize
+    def initialize(project)
       @pinned_build_phases = []
       @build_phases = []
       @build_rules = []
@@ -200,6 +203,7 @@ module Xcake
       @system_libraries = []
       @target_dependencies = []
       @schemes = []
+      @project = project
 
       yield(self) if block_given?
     end
@@ -209,7 +213,7 @@ module Xcake
     # Creates a new scheme for the target
     #
     # @param  [String] name
-    #         the name of the new scheme 
+    #         the name of the new scheme
     #
     # @return [Scheme] the scheme
     #         the newly created scheme
@@ -232,6 +236,10 @@ module Xcake
       @system_frameworks ||= default_system_frameworks_for(platform)
     end
 
+    def info_plist_paths
+      all_configurations.map { |config| config.settings['INFOPLIST_FILE'] }.uniq
+    end
+
     # @!group Conversion
 
     def to_s

data/lib/xcake/generator.rb

@@ -3,6 +3,7 @@ module Xcake
     include Dependency
     include Plugin
     include Visitor
+    Class.send(:include, CoreExtensions::ClassDescendants) # done with send because of old ruby versions
 
     attr_accessor :context
 

data/lib/xcake/generator/default_project_structure_generator.rb

@@ -8,7 +8,6 @@ module Xcake
   # and targets have all of the same configurations.
   #
   class DefaultProjectStructureGenerator < Generator
-
     def self.dependencies
       [ProjectMetadataGenerator, TargetGenerator]
     end
@@ -40,11 +39,11 @@ module Xcake
 
       target.all_configurations.each do |c|
         target.scheme "#{target.name}-#{c.name}" do |s|
-            s.test_configuration = c.name
-            s.launch_configuration = c.name
-            s.profile_configuration = c.name
-            s.analyze_configuration = c.name
-            s.archive_configuration = c.name
+          s.test_configuration = c.name
+          s.launch_configuration = c.name
+          s.profile_configuration = c.name
+          s.analyze_configuration = c.name
+          s.archive_configuration = c.name
         end
       end
     end

data/lib/xcake/generator/project_generator.rb

@@ -1,13 +1,14 @@
 module Xcake
   class ProjectGenerator < Generator
     def self.dependencies
-      Generator.descendants.select do |g|
-        g != self
+      Generator.descendants.reject do |g|
+        g == self
       end
     end
 
     def leave_project(project)
       native_project = @context.native_object_for(project)
+      project.run_hook :before_save, native_project
       native_project.save
       project.run_hook :after_save