xcode-archive-cache 0.0.8.pre.1 → 0.0.8.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 153bd48a6899fb06dd35f7e7a6d45e81e31b10addee748cf5cd5ba56ad82ba17
-  data.tar.gz: 485fca1a778dfffe38d7d4a09315dda122c0dcc08c828999f2559bf35d750c52
+  metadata.gz: 52f8f43f53d74aef2d09148fe876d585c3cacf6f8f280a493684e235fb718d7f
+  data.tar.gz: 71df654b2b3d8e4bc867357b83e86bf6f2aea403f9d15c2552bdefe1d3688331
 SHA512:
-  metadata.gz: 154fa88f04f1e01f0faae4155ff4f0dd558de0c2dce805728bd42ff77fbe5944c84d16fd8a4221279183e22c3a9eb0741429382c834ce1a2662413fcc83fdca7
-  data.tar.gz: 6ba834613e56bd982e2d36bd5a7828b6f527b743fc40b7d577b3af69e573c7ebdb3aa506c51b1a222fcb7122a58e40be8ec3ef7702614d7729d1cd6066d1bda6
+  metadata.gz: a2e2ebc240b6ec293000cc023e65ed11a563ba841cb3dfafbab7e8d1ceaae0d9a21d2d9d0b556ff450495be9f20384adb27b34f68614f716aedf1e1aab9c28e4
+  data.tar.gz: 472d0209a2a24f01c8f07a7e33bdafbd85d915dbfd358f1f0799ca47ba3b34456f11d09ba67bc38874b95452f8e88d2e6540ae3ed5ab654a9cc6206a5d51cc64

data/lib/build/product_extractor.rb

@@ -11,9 +11,13 @@ module XcodeArchiveCache
         @shell_executor = XcodeArchiveCache::Shell::Executor.new
       end
 
-      def list_product_contents(root_target_name, built_node)
-        file_paths = list_products(root_target_name, built_node)
-        file_paths.select {|path| File.exist?(path)}.map {|path| File.realpath(path) }
+      # @param [XcodeArchiveCache::BuildGraph::Node] built_node
+      #
+      # @return [Array<String>]
+      #
+      def list_product_contents(built_node)
+        file_paths = list_products(built_node)
+        file_paths.select {|path| File.exist?(path)}.map {|path| File.realpath(path)}
       end
 
       private
@@ -32,11 +36,15 @@ module XcodeArchiveCache
 
       # @param [XcodeArchiveCache::BuildGraph::Node] built_node
       #
-      def list_products(root_target_name, built_node)
+      # @return [Array<String>]
+      #
+      def list_products(built_node)
         if built_node.has_framework_product?
-          list_framework_products(root_target_name, built_node)
-        elsif built_node.has_static_library_product?
-          list_static_lib_products(root_target_name, built_node)
+          list_framework_products(built_node)
+        elsif built_node.has_acceptable_product?
+          list_single_product(built_node)
+        else
+          raise Informative, "#{built_node.name} has unsupported product type: #{built_node.native_target.product_type}"
         end
       end
 
@@ -44,8 +52,8 @@ module XcodeArchiveCache
       #
       # @return [Array<String>]
       #
-      def list_framework_products(root_target_name, built_node)
-        framework_glob = get_main_product_glob(root_target_name, built_node)
+      def list_framework_products(built_node)
+        framework_glob = get_main_product_glob(built_node)
         framework_path = Dir.glob(framework_glob).first
         unless framework_path
           raise Informative, "Framework product not found for #{built_node.name}"
@@ -63,21 +71,21 @@ module XcodeArchiveCache
       #
       # @return [Array<String>]
       #
-      def list_static_lib_products(root_target_name, built_node)
-        static_lib_glob = get_main_product_glob(root_target_name, built_node)
-        static_lib_path = Dir.glob(static_lib_glob).first
-        unless static_lib_path
-          raise Informative, "Static library product not found for #{built_node.name}"
+      def list_single_product(built_node)
+        product_glob = get_main_product_glob(built_node)
+        product_path = Dir.glob(product_glob).first
+        unless product_path
+          raise Informative, "Product of type #{built_node.native_target.product_type} not found for #{built_node.name}"
         end
 
-        [static_lib_path]
+        [product_path]
       end
 
       # @param [XcodeArchiveCache::BuildGraph::Node] built_node
       #
       # @return [String]
       #
-      def get_main_product_glob(root_target_name, built_node)
+      def get_main_product_glob(built_node)
         product_name = built_node.native_target.product_reference.name ?
                            built_node.native_target.product_reference.name :
                            built_node.native_target.product_reference.path
@@ -86,14 +94,6 @@ module XcodeArchiveCache
                   File.basename(product_name))
       end
 
-      # @param [XcodeArchiveCache::BuildGraph::Node] built_node
-      #
-      # @return [String]
-      #
-      def configuration_dir(built_node)
-        "#{configuration}-#{built_node.native_target.sdk}"
-      end
-
       # @param [String] framework_path
       #
       # @return [Array<String>]

data/lib/build_graph/node.rb

@@ -55,6 +55,14 @@ module XcodeArchiveCache
         native_target.product_type == Xcodeproj::Constants::PRODUCT_TYPE_UTI[:static_library]
       end
 
+      def has_bundle_product?
+        native_target.product_type == Xcodeproj::Constants::PRODUCT_TYPE_UTI[:bundle]
+      end
+
+      def has_acceptable_product?
+        ACCEPTABLE_PRODUCT_TYPES.include?(native_target.product_type)
+      end
+
       # @return [String]
       #
       def product_file_name
@@ -112,6 +120,12 @@ module XcodeArchiveCache
         dependency_names = dependencies.length > 0 ? dependencies.map(&:name).join(", ") : "<none>"
         "#{name}\n\troot: #{is_root}\n\tproduct: #{product_file_name}\n\tsha: #{sha_string}\n\tstate: #{state}\n\tdependent: #{dependent_names}\n\tdependencies: #{dependency_names}"
       end
+
+      private
+
+      ACCEPTABLE_PRODUCT_TYPES = [Xcodeproj::Constants::PRODUCT_TYPE_UTI[:framework],
+                                  Xcodeproj::Constants::PRODUCT_TYPE_UTI[:static_library],
+                                  Xcodeproj::Constants::PRODUCT_TYPE_UTI[:bundle]].freeze
     end
   end
 end

data/lib/injection/injector.rb

@@ -49,6 +49,7 @@ module XcodeArchiveCache
         #
         if graph.node_by_name(get_pods_target_name(target))
           pods_fixer.fix_embed_frameworks_script(target, graph, storage.container_dir_path)
+          pods_fixer.fix_copy_resources_script(target, graph, storage.container_dir_path)
         else
           framework_nodes = graph.nodes.select {|node| node.has_framework_product?}
           framework_file_paths = framework_nodes.map {|node| File.join(storage.get_storage_path(node), node.product_file_name)}
@@ -113,10 +114,10 @@ module XcodeArchiveCache
       # @param [Array<String>] paths
       #
       def add_header_paths_to_target(target, paths)
-        debug("adding #{paths} to #{target.display_name}")
-
         return if paths == nil
 
+        debug("adding #{paths} to #{target.display_name}")
+
         build_configuration = find_build_configuration(target)
         paths.each do |path|
           build_flags_changer.add_headers_search_path(build_configuration, path)
@@ -153,12 +154,14 @@ module XcodeArchiveCache
       def add_as_prebuilt_dependency(prebuilt_node, dependent_target, should_link)
         debug("adding #{prebuilt_node.name} as prebuilt to #{dependent_target.display_name}")
 
+        unless prebuilt_node.has_acceptable_product?
+          raise Informative, "#{prebuilt_node.name} has unsupported product type: #{prebuilt_node.native_target.product_type}"
+        end
+
         if prebuilt_node.has_framework_product?
           add_as_prebuilt_framework(prebuilt_node, dependent_target)
         elsif prebuilt_node.has_static_library_product?
           add_as_prebuilt_static_lib(prebuilt_node, dependent_target, should_link)
-        else
-          raise ArgumentError.new, "#{prebuilt_node.name} has unsupported product type: #{prebuilt_node.native_target.product_type}"
         end
 
         debug("done with #{prebuilt_node.name} for #{dependent_target.display_name}")
@@ -197,7 +200,7 @@ module XcodeArchiveCache
       def find_build_configuration(target)
         build_configuration = target.build_configurations.select {|configuration| configuration.name == configuration_name}.first
         unless build_configuration
-          raise ArgumentError.new, "#{configuration_name} build configuration not found on target #{node.name}"
+          raise Informative, "#{configuration_name} build configuration not found on target #{node.name}"
         end
 
         build_configuration

data/lib/injection/pods_script_fixer.rb

@@ -17,14 +17,19 @@ module XcodeArchiveCache
         file_path = find_embed_frameworks_script(target, build_settings)
         return unless file_path
 
-        info("fixing #{file_path}")
-        script = File.read(file_path)
-        graph.nodes.each do |node|
-          relative_product_path = "#{node.native_target.display_name}/#{node.product_file_name}"
-          script = script.gsub("${BUILT_PRODUCTS_DIR}/#{relative_product_path}", File.join(products_dir, relative_product_path))
-        end
+        fix_script(file_path, graph, products_dir)
+      end
 
-        File.open(file_path, "w") {|file| file.puts(script)}
+      # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
+      # @param [XcodeArchiveCache::BuildGraph::Graph] graph
+      # @param [String] products_dir
+      #
+      def fix_copy_resources_script(target, graph, products_dir)
+        build_settings = graph.dependent_build_settings
+        file_path = find_copy_resources_script(target, build_settings)
+        return unless file_path
+
+        fix_script(file_path, graph, products_dir)
       end
 
       private
@@ -39,8 +44,27 @@ module XcodeArchiveCache
       # @return [String]
       #
       def find_embed_frameworks_script(target, build_settings)
+        find_script(target, build_settings, "[CP] Embed Pods Frameworks")
+      end
+
+      # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
+      # @param [XcodeArchiveCache::BuildSettings::Container] build_settings
+      #
+      # @return [String]
+      #
+      def find_copy_resources_script(target, build_settings)
+        find_script(target, build_settings, "[CP] Copy Pods Resources")
+      end
+
+      # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
+      # @param [XcodeArchiveCache::BuildSettings::Container] build_settings
+      # @param [String] script_name
+      #
+      # @return [String]
+      #
+      def find_script(target, build_settings, script_name)
         target.shell_script_build_phases.each do |phase|
-          if phase.display_name == "[CP] Embed Pods Frameworks"
+          if phase.display_name == script_name
             return build_settings_interpolator.interpolate(phase.shell_script, build_settings)
                        .gsub(/^"|"$/, "")
                        .strip
@@ -49,6 +73,22 @@ module XcodeArchiveCache
 
         nil
       end
+
+      # @param [String] file_path
+      # @param [XcodeArchiveCache::BuildGraph::Node] graph
+      # @param [String] products_dir
+      #
+      def fix_script(file_path, graph, products_dir)
+        info("fixing #{file_path}")
+        script = File.read(file_path)
+        graph.nodes.each do |node|
+          relative_product_path = "#{node.native_target.display_name}/#{node.product_file_name}"
+          absolute_product_path = File.join(products_dir, relative_product_path)
+          script = script.gsub(Regexp.new("\"[^\"]+\/#{node.product_file_name}\""), "\"#{absolute_product_path}\"")
+        end
+
+        File.open(file_path, "w") {|file| file.puts(script)}
+      end
     end
   end
 end

data/lib/runner/runner.rb

@@ -131,7 +131,7 @@ module XcodeArchiveCache
       graph.nodes
           .select(&:waiting_for_rebuild)
           .each do |node|
-        file_paths = @product_extractor.list_product_contents(root_target.name, node)
+        file_paths = @product_extractor.list_product_contents(node)
         @injection_storage.store_products(node, file_paths)
         @cache_storage.store(node, @injection_storage.get_storage_path(node))
         node.state = :rebuilt_and_cached

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-archive-cache
 version: !ruby/object:Gem::Version
-  version: 0.0.8.pre.1
+  version: 0.0.8.pre.2
 platform: ruby
 authors:
 - Ilya Dyakonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-30 00:00:00.000000000 Z
+date: 2019-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj