xcode-archive-cache 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f444a19221b84c55a31be3d82277eef653239bdec9299d65b1252c1874dae15
-  data.tar.gz: 9f1927ba1c9bf360d83a3b4febf128b069b8d846eca236a8d8f9bd848de9af24
+  metadata.gz: 3c3de4b956fe76ce673329ecf9977a911d3c6bb3055c00e59c3e6903cb16e6b2
+  data.tar.gz: 92253d7316a2a716b71a053f182483e7af54aeb1662111175f3e071909d79998
 SHA512:
-  metadata.gz: a0b85c53b4127976dfee59597aade6e6e7d0064841b8ea240446f9f7482bf3bd438a482cc3d75bd86caa917c040fe5e9f89f3c35e07291fdb8cd08d3f5b6b9e6
-  data.tar.gz: c52f972d48a54b9331985d0b7a39f8e131a77a0e46c3cb8c0501422f313deb279b4ed9d0974fb99be7cd83f40a40feb374ae3d6f0feb73b5376089d7d574324a
+  metadata.gz: 88b0a7e44eecbdc426755761dd5df10fb0e1cff4a00c44f915df1f65515685ce3f2527d8d9b1173ea439bff032d49f4875f32a859291a702f829d378103c8234
+  data.tar.gz: c63650b58e921da5e38bb8648d0e6e3cfeddb55165e72f8984511c769a139b6ab3108350c0e684ed27ed9dbf9e02ef46135cc315a182ebc00586bb33c3fdae1f

data/lib/artifact_cache/archiver.rb

@@ -9,7 +9,8 @@ module XcodeArchiveCache
       #
       def archive(path, destination)
         if File.exists?(destination)
-          raise ArgumentError.new, "Artifact cache path #{destination} is already taken"
+          warn "Replacing artifact archive at path #{destination}"
+          FileUtils.rm_rf(destination)
         end
 
         if File.file?(path)

data/lib/artifact_cache/local_storage.rb

@@ -60,7 +60,8 @@ module XcodeArchiveCache
         state_file_path = archive_path + ".state"
 
         if File.exist?(state_file_path)
-          raise ArgumentError.new, "State file already exists: #{state_file_path}"
+          warn "Replacing state file #{state_file_path}"
+          FileUtils.rm_f(state_file_path)
         end
 
         dependency_shas = node.dependencies

data/lib/build/performer.rb

@@ -35,7 +35,7 @@ module XcodeArchiveCache
       # @param [XcodeArchiveCache::BuildGraph::Graph] graph
       #
       def should_rebuild?(graph)
-        graph.nodes.reduce(false) {|rebuild, node| rebuild || node.waiting_for_rebuild}
+        graph.root_node.state != :unpacked
       end
 
       private

data/lib/build/product_extractor.rb

@@ -2,6 +2,8 @@ module XcodeArchiveCache
   module Build
     class ProductExtractor
 
+      include XcodeArchiveCache::Logs
+
       # @param [String] configuration
       # @param [String] derived_data_path
       #
@@ -17,7 +19,9 @@ module XcodeArchiveCache
       #
       def list_product_contents(built_node)
         file_paths = list_products(built_node)
-        file_paths.select {|path| File.exist?(path)}.map {|path| File.realpath(path)}
+        file_paths
+          .select { |path| File.exist?(path) }
+          .map { |path| File.realpath(path) }
       end
 
       private
@@ -44,7 +48,7 @@ module XcodeArchiveCache
         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}"
+          raise XcodeArchiveCache::Informative, "#{built_node.name} has unsupported product type: #{built_node.native_target.product_type}"
         end
       end
 
@@ -56,7 +60,7 @@ module XcodeArchiveCache
         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}"
+          raise XcodeArchiveCache::Informative, "Framework product not found for #{built_node.name}"
         end
 
         framework_dsym_glob = File.join(File.dirname(framework_glob), built_node.dsym_file_name)
@@ -75,10 +79,42 @@ module XcodeArchiveCache
         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}"
+          raise XcodeArchiveCache::Informative, "Product of type #{built_node.native_target.product_type} not found for #{built_node.name}"
+        end
+
+        paths = [product_path]
+
+        # this one is generated during Swift compilation
+        # so we need to cache it as well
+        #
+        swift_objc_interface_header_glob = get_swift_objc_interface_header_glob(built_node)
+        swift_objc_interface_header_path = Dir.glob(swift_objc_interface_header_glob).first
+        if swift_objc_interface_header_path
+          debug("using Swift-ObjC interface header #{swift_objc_interface_header_path}")
+          paths << swift_objc_interface_header_path
+        end
+
+        swiftmodule_glob = get_swiftmodule_glob(built_node)
+        if swiftmodule_glob
+          swiftmodule_path = Dir.glob(swiftmodule_glob).first
+          
+          if swiftmodule_path
+            debug("using swiftmodule #{swiftmodule_path}")
+            paths << swiftmodule_path
+          end
+        end
+
+        modulemap_glob = get_modulemap_glob(built_node)
+        if modulemap_glob
+          modulemap_path = Dir.glob(modulemap_glob).first
+
+          if modulemap_path
+            debug("using modulemap #{modulemap_path}")
+            paths << modulemap_path
+          end
         end
 
-        [product_path]
+        paths
       end
 
       # @param [XcodeArchiveCache::BuildGraph::Node] built_node
@@ -89,9 +125,52 @@ module XcodeArchiveCache
         product_name = built_node.native_target.product_reference.name ?
                            built_node.native_target.product_reference.name :
                            built_node.native_target.product_reference.path
+        get_product_glob(File.basename(product_name))
+      end
+
+      # @param [XcodeArchiveCache::BuildGraph::Node] built_node
+      #
+      # @return [String]
+      #
+      def get_swift_objc_interface_header_glob(built_node)
+        get_product_glob(File.basename(built_node.swift_objc_interface_header_file))
+      end
+
+      # @param [XcodeArchiveCache::BuildGraph::Node] built_node
+      #
+      # @return [String]
+      #
+      def get_swiftmodule_glob(built_node)
+        if built_node.module_name
+          get_product_glob(built_node.module_name + ".swiftmodule")
+        end
+      end
+
+      # @param [XcodeArchiveCache::BuildGraph::Node] built_node
+      #
+      # @return [String]
+      #
+      def get_modulemap_glob(built_node)
+        resulting_modulemap_file_name = built_node.resulting_modulemap_file_name
+        if resulting_modulemap_file_name
+          get_product_glob(resulting_modulemap_file_name)
+        else
+          modulemap_file_path = built_node.original_modulemap_file_path
+          if modulemap_file_path && File.exist?(modulemap_file_path)
+            modulemap_file_name = File.basename(modulemap_file_path)
+            get_product_glob(modulemap_file_name)
+          end
+        end
+      end
+
+      # @param [String] file_name
+      #
+      # @return [String]
+      #
+      def get_product_glob(file_name)
         File.join(derived_data_path,
                   "**",
-                  File.basename(product_name))
+                  file_name)
       end
 
       # @param [String] framework_path
@@ -102,11 +181,11 @@ module XcodeArchiveCache
         executable_name = File.basename(framework_path, File.extname(framework_path))
         executable_path = File.join(framework_path, executable_name)
         unless File.exist?(executable_path)
-          raise Informative, "Failed to find executable inside framework: #{framework_path}"
+          raise XcodeArchiveCache::Informative, "Failed to find executable inside framework: #{framework_path}"
         end
 
         uuids = list_bc_symbolmap_uuids(executable_path)
-        uuids.map {|uuid| find_bc_symbolmap(uuid)}.flatten
+        uuids.map { |uuid| find_bc_symbolmap(uuid) }.flatten
       end
 
       # @param [String] executable_path
@@ -114,7 +193,11 @@ module XcodeArchiveCache
       # @return [Array<String>]
       #
       def list_bc_symbolmap_uuids(executable_path)
-        shell_executor.execute_for_output("otool -l #{executable_path} | grep uuid | awk {'print $2'}").split("\n")
+        begin
+          shell_executor.execute_for_output("otool -l #{executable_path} | grep uuid | awk {'print $2'}").split("\n")
+        rescue
+          []
+        end
       end
 
       # @param [String] uuid

data/lib/build_graph/builder.rb

@@ -6,8 +6,8 @@ module XcodeArchiveCache
 
       # @param [XcodeArchiveCache::Xcodebuild::Executor] xcodebuild_executor
       #
-      def initialize(native_target_finder, xcodebuild_executor)
-        @build_settings_loader = XcodeArchiveCache::BuildSettings::Loader.new(xcodebuild_executor)
+      def initialize(native_target_finder, build_settings_loader)
+        @build_settings_loader = build_settings_loader
         @native_target_finder = native_target_finder
         @sha_calculator = NodeShaCalculator.new
       end
@@ -61,13 +61,17 @@ module XcodeArchiveCache
         display_name = target.display_name
         if target_stack.include?(display_name)
           target_stack.push(display_name)
-          raise Informative, "Circular dependency detected: #{target_stack.join(" -> ")}"
+          raise XcodeArchiveCache::Informative, "Circular dependency detected: #{target_stack.join(" -> ")}"
         end
 
         node = ALL_NODES.select {|node| node.native_target.uuid == target.uuid && node.native_target.project == target.project}.first
         if node
           debug("already traversed this one")
-          graph.add_multiple_nodes(node.subgraph) unless graph.nodes.include?(node)
+          unless graph.nodes.include?(node)
+            nodes_to_add = node.subgraph.select {|subgraph_node| !graph.nodes.include?(subgraph_node)}
+            graph.add_multiple_nodes(nodes_to_add)
+          end
+
           return node
         else
           debug("adding new node")
@@ -79,11 +83,7 @@ module XcodeArchiveCache
         dependencies = []
         target_stack.push(display_name)
 
-        dependency_targets = target.dependencies.map {|dependency| native_target_finder.find_for_dependency(dependency)} +
-            target.frameworks_build_phase.files.map {|file| native_target_finder.find_for_file(file)}
-
-        # PBXNativeTarget has no custom equality check
-        deduplicated_targets = dependency_targets.compact.uniq {|dependency_target| dependency_target.uuid + dependency_target.display_name}
+        deduplicated_targets = native_target_finder.find_native_dependencies(target)
         debug("dependency targets: #{deduplicated_targets.map(&:display_name)}")
 
         deduplicated_targets.each do |dependency_target|
@@ -141,7 +141,7 @@ module XcodeArchiveCache
         info("getting settings for #{target.display_name}")
         build_settings = build_settings_loader.get_settings(target.project.path, target.display_name)
         unless build_settings
-          raise Informative, "No build settings loaded for #{target.display_name}"
+          raise XcodeArchiveCache::Informative, "No build settings loaded for #{target.display_name}"
         end
 
         build_settings

data/lib/build_graph/native_target_finder.rb

@@ -3,9 +3,14 @@ module XcodeArchiveCache
     class NativeTargetFinder
 
       # @param [Array<Xcodeproj::Project>] projects
+      # @param [String] build_configuration_name
       #
-      def initialize(projects)
+      def initialize(projects, build_configuration_name)
         @all_targets = extract_targets(projects)
+        @build_configuration_name = build_configuration_name
+        @interpolator = XcodeArchiveCache::BuildSettings::StringInterpolator.new
+
+        setup_product_name_to_target_mapping
       end
 
       # @param [Array<Xcodeproj::Project>] projects
@@ -14,30 +19,67 @@ module XcodeArchiveCache
       #
       def extract_targets(projects)
         projects
-            .map {|project| unnest(project)}
-            .flatten
-            .uniq
-            .map(&:native_targets)
-            .flatten
-            .select {|target| !target.test_target_type?}
+          .map {|project| unnest(project)}
+          .flatten
+          .sort_by(&:path)
+          .inject([]) {|unique, current| unique.last && unique.last.path == current.path ? unique : unique + [current]}
+          .map(&:native_targets)
+          .flatten
+          .select {|target| !target.test_target_type?}
       end
 
       # @param [String] platform_name
       #
+      # @return [Array<Xcodeproj::Project::Object::PBXNativeTarget>]
+      #
       def set_platform_name_filter(platform_name)
         @platform_name = platform_name
       end
 
+      # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
+      #
+      # @return [Array<Xcodeproj::Project::Object::PBXNativeTarget>]
+      #
+      def find_native_dependencies(target)
+        direct_dependencies = target
+                                .dependencies
+                                .map {|dependency| find_for_dependency(dependency)}
+        linked_dependencies = find_linked_dependencies(target)
+        join(direct_dependencies, linked_dependencies)
+      end
+
+      # @param [Xcodeproj::Project::Object::PBXAbstractTarget] target
+      #
+      # @return [Array<Xcodeproj::Project::Object::PBXAbstractTarget>]
+      #
+      def find_all_dependencies(target)
+        direct_dependencies = target
+                                .dependencies
+                                .map {|dependency| find_any_for_dependency(dependency)}
+        linked_dependencies = []
+        
+        if target.is_a?(Xcodeproj::Project::Object::PBXNativeTarget) 
+          linked_dependencies = find_linked_dependencies(target)
+        end
+
+        join(direct_dependencies, linked_dependencies)
+      end
+
       # @param [Xcodeproj::Project::Object::PBXTargetDependency] dependency
       #
       # @return [Xcodeproj::Project::Object::PBXNativeTarget]
       #
       def find_for_dependency(dependency)
         # targets from embedded projects are proxied
-        target = dependency.target ? dependency.target : dependency.target_proxy.proxied_object
+        target = find_any_for_dependency(dependency)
         target.is_a?(Xcodeproj::Project::Object::PBXNativeTarget) ? target : nil
       end
 
+      def find_any_for_dependency(dependency)
+        target = dependency.target ? dependency.target : dependency.target_proxy.proxied_object
+        target && target.platform_name == platform_name ? target : nil
+      end
+
       # @param [Xcodeproj::Project::Object::PBXBuildFile] file
       #
       # @return [Xcodeproj::Project::Object::PBXNativeTarget]
@@ -60,7 +102,7 @@ module XcodeArchiveCache
           end
 
           if target == nil
-            raise Informative, "Target for #{file.file_ref.path} not found"
+            raise XcodeArchiveCache::Informative, "Target for #{file.file_ref.path} not found"
           end
 
           target
@@ -68,7 +110,7 @@ module XcodeArchiveCache
           # products of sibling project targets are added as PBXFileReferences
           targets = find_with_product_path(file.file_ref.path)
           if targets.length > 1
-            raise Informative, "Found more than one target with product #{File.basename(file.file_ref.path)} in:\n#{targets.map(&:project)}"
+            raise XcodeArchiveCache::Informative, "Found more than one target with product #{File.basename(file.file_ref.path)} in:\n#{targets.map(&:project)}"
           end
 
           targets.first
@@ -77,9 +119,16 @@ module XcodeArchiveCache
 
       # @param [String] product_name
       #
+      # @return [Xcodeproj::Project::Object::PBXNativeTarget]
+      #
       def find_for_product_name(product_name)
-        all_targets.select {|native_target| native_target.name == product_name || native_target.product_reference.display_name == product_name}
-            .first
+        canonical = all_targets
+          .select {|native_target| native_target.name == product_name || native_target.product_reference.display_name == product_name}
+          .first
+        
+        parsed = @product_name_to_target[product_name]
+
+        canonical ? canonical : parsed
       end
 
       private
@@ -92,6 +141,36 @@ module XcodeArchiveCache
       #
       attr_accessor :platform_name
 
+      # @return [String]
+      #
+      attr_reader :build_configuration_name
+
+      def setup_product_name_to_target_mapping
+        @product_name_to_target = Hash.new
+
+        @all_targets.each do |target|
+          build_settings = target.find_build_configuration(build_configuration_name, raise_if_not_found: false)&.build_settings
+          next unless build_settings
+
+          full_settings = build_settings
+          full_settings[XcodeArchiveCache::BuildSettings::TARGET_NAME_KEY] = target.name
+          product_name = @interpolator.interpolate(build_settings[XcodeArchiveCache::BuildSettings::PRODUCT_NAME_KEY], full_settings)
+
+          next if product_name == nil
+
+          product_name_extension = ""
+          case target.product_type
+          when Xcodeproj::Constants::PRODUCT_TYPE_UTI[:framework]
+            product_name_extension = ".framework"
+          when Xcodeproj::Constants::PRODUCT_TYPE_UTI[:static_library]
+            product_name_extension = ".a"
+          end
+
+          full_product_name = "#{product_name}#{product_name_extension}"
+          @product_name_to_target[full_product_name] = target
+        end
+      end
+
       # @param [Xcodeproj::Project] project
       #
       # @return [Array<Xcodeproj::Project>]
@@ -106,6 +185,28 @@ module XcodeArchiveCache
         [project] + nested_projects + subnested_projects
       end
 
+      # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
+      #
+      # @return [Array<Xcodeproj::Project::Object::PBXNativeTarget>]
+      #
+      def find_linked_dependencies(target)
+        target
+          .frameworks_build_phase
+          .files
+          .map {|file| find_for_file(file)}
+      end
+
+      # @param [Array<Xcodeproj::Project::Object::PBXAbstractTarget>] direct_dependencies
+      # @params [Array<Xcodeproj::Project::Object::PBXNativeTarget>] linked_dependencies
+      #
+      # @return [Array<Xcodeproj::Project::Object::PBXAbstractTarget>]
+      #
+      def join(direct_dependencies, linked_dependencies)
+        (direct_dependencies + linked_dependencies)
+          .compact
+          .uniq(&:equatable_identifier)
+      end
+
       # @param [String] uuid
       #
       # @return [Xcodeproj::Project::Object::PBXNativeTarget]
@@ -128,7 +229,16 @@ module XcodeArchiveCache
       # @return [Array<Xcodeproj::Project::Object::PBXNativeTarget>]
       #
       def find_with_product_path(path)
-        all_targets.select {|target| target.platform_name == platform_name && target.product_reference.path == path}
+        canonical = all_targets.select {|target| target.platform_name == platform_name && target.product_reference.path == path }
+        parsed = @product_name_to_target[File.basename(path)]
+
+        if canonical.length > 0
+          canonical
+        elsif parsed
+          [parsed]
+        else
+          []
+        end
       end
     end
   end