xcake 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86c372ce021180935c67107696f5e8e55fa36ffe
-  data.tar.gz: 25674ec3f215c50ade468d5b75dbbf70447d2cb7
+  metadata.gz: 6858ef15a3027664fd7f953f91e79482b66d26a5
+  data.tar.gz: 67a4a8498f51c731b32011ae958f648e09294b22
 SHA512:
-  metadata.gz: b1a7f95ce97de5a13b66d94d60c14a788a3c1e21b988c79c2e43b651d65ddbc62e40d7fc0e90911b93afa04818f102f38848465bf442e42c3eda83b46737950c
-  data.tar.gz: 471f33c6788b1dfaed7af4b812ac206aeac54ec6885524b9370af522304367663d2096abe95e79f0c625659e2cb6448cd67faf2ca2760df015bf489dab889875
+  metadata.gz: 17081626ee2a49b2da92c8de2699a65968c5d466809e16a82c8fd341b0ecec808e759f35af1674d4e91e4a4d157653dc0ad4bd71c77c7d590b1c0e87dba58698
+  data.tar.gz: 63bbf69191aa88a4cbb6c7f05901ee62a07e746bf265726ddc4da41b4377f50af0d0a7f0352dca1a8a765f2a1cb0c8afb1db2ce330c4fbde537a91185d041891

data/lib/xcake/constants.rb

@@ -1,6 +1,8 @@
+require 'active_support/core_ext/hash/deep_merge'
+
 module Xcake
   module Constants
-    COMMON_BUILD_SETTINGS = Xcodeproj::Constants::COMMON_BUILD_SETTINGS.deep_merge(
+    COMMON_BUILD_SETTINGS = Xcodeproj::Constants::COMMON_BUILD_SETTINGS.dup.deep_merge(
       [:ios, :unit_test_bundle] => {
         'LD_RUNPATH_SEARCH_PATHS' => [
           '$(inherited)',
@@ -8,17 +10,33 @@ module Xcake
           '@loader_path/Frameworks'
         ]
       }.freeze,
+      [:ios, :ui_test_bundle] => {
+        "LD_RUNPATH_SEARCH_PATHS" => [
+          "$(inherited)",
+          "@executable_path/Frameworks",
+          "@loader_path/Frameworks"
+        ]
+      }.freeze,
       [:osx, :unit_test_bundle] => {
         'LD_RUNPATH_SEARCH_PATHS' => [
           '$(inherited)',
           '@executable_path/../Frameworks',
           '@loader_path/../Frameworks'
         ]
+      }.freeze,
+      [:osx, :ui_test_bundle] => {
+        "LD_RUNPATH_SEARCH_PATHS" => [
+          "$(inherited)",
+          "@executable_path/../Frameworks",
+          "@loader_path/../Frameworks"
+        ]
       }.freeze
     ).freeze
 
     PRODUCT_TYPE_UTI = Xcodeproj::Constants::PRODUCT_TYPE_UTI
 
+    COPY_FILES_BUILD_PHASE_DESTINATIONS = Xcodeproj::Constants::COPY_FILES_BUILD_PHASE_DESTINATIONS
+
     # Returns the common build settings for a given platform and configuration
     # name.
     #

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

@@ -8,16 +8,30 @@ module Xcake
     # The name of files to copy
     attr_accessor :files
 
+    # The destination
+    attr_accessor :destination
+
+    # The destination path
+    attr_accessor :destination_path
+
+    # Whether the files should be code signed on copy
+    attr_accessor :code_sign
+
     def build_phase_type
       Xcodeproj::Project::Object::PBXCopyFilesBuildPhase
     end
 
-    def configure_native_build_phase(native_build_phase, _context)
+    def configure_native_build_phase(native_build_phase, context)
       native_build_phase.name = name
+      native_build_phase.dst_path = destination_path
+      native_build_phase.symbol_dst_subfolder_spec = destination
 
       @files.each do |file|
         file_reference = context.file_reference_for_path(file)
-        native_build_phase.add_file_reference(file_reference)
+        build_file = native_build_phase.add_file_reference(file_reference)
+        if code_sign
+          build_file.settings = { 'ATTRIBUTES' => ['CodeSignOnCopy'] }
+        end
       end
     end
 

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

@@ -97,13 +97,16 @@ module Xcake
 
       if host_target.type == :application
         test_target.all_configurations.each do |c|
-
-          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}"
+          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['TEST_HOST'] = "$(BUILT_PRODUCTS_DIR)/#{host_target.name}.app/#{host_target.name}"
+            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
       end

data/lib/xcake/generator/default_project_structure_generator.rb

@@ -16,6 +16,11 @@ module Xcake
     def visit_project(project)
       EventHooks.run_hook :before_resolving_project_structure, project
       @project = project
+
+      # Make sure we always have a Release and Debug configuration as Xcode expects these
+      # and these fixes bugs that can happen.
+      @project.debug_configuration
+      @project.release_configuration
     end
 
     def leave_project(project)

data/lib/xcake/generator/target_file_reference_generator.rb

@@ -13,13 +13,21 @@ module Xcake
       [TargetGenerator]
     end
 
-    def visit_target(target)
-      paths_to_include = Dir.glob(target.include_files).map do |f|
-        Pathname.new(f).cleanpath.to_s
+    ## This method will return an array of files based on the passed regular Exp
+    ## NOTE:- directories will not be included in the array
+    def get_cleaned_paths(reg_exp)
+      paths_without_directories = Dir.glob(reg_exp).reject do |f|
+        File.directory?(f)
       end
-      paths_to_exclude = Dir.glob(target.exclude_files).map do |f|
+      paths = paths_without_directories.map do |f|
         Pathname.new(f).cleanpath.to_s
       end
+      paths
+    end
+
+    def visit_target(target)
+      paths_to_include = get_cleaned_paths(target.include_files)
+      paths_to_exclude = get_cleaned_paths(target.exclude_files)
 
       paths = paths_to_include - paths_to_exclude
       paths.each do |p|

data/lib/xcake/version.rb

@@ -1,3 +1,3 @@
 module Xcake
-  VERSION = '0.8.9'.freeze
+  VERSION = '0.8.10'.freeze
 end

data/lib/xcake/xcode/project.rb

@@ -49,6 +49,14 @@ module Xcake
         Xcodeproj::Constants::DEFAULT_OBJECT_VERSION.to_s
       end
 
+      def archive_version
+        Xcodeproj::Constants::LAST_KNOWN_ARCHIVE_VERSION.to_s
+      end
+
+      def classes
+        {}
+      end
+
       # Configures the Project for use with Xcake.
       # This makes sure we have sensible defaults and
       # it as clean as possible.

data/xcake.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'cork'
   spec.add_dependency 'hooks', '~> 0.4.1'
   spec.add_dependency 'xcodeproj', '< 2.0.0', '>= 1.4.0'
+  spec.add_dependency 'deep_merge'
 
   # Lock `activesupport` (transitive dependency via `xcodeproj`) to keep supporting system ruby
   spec.add_dependency 'activesupport', '< 5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcake
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - James Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -78,6 +78,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement