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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52f8f43f53d74aef2d09148fe876d585c3cacf6f8f280a493684e235fb718d7f
-  data.tar.gz: 71df654b2b3d8e4bc867357b83e86bf6f2aea403f9d15c2552bdefe1d3688331
+  metadata.gz: ff86c853bc7b50f265964695cd55edd14821c821f5d27a1f916dcc23ccc1c4b4
+  data.tar.gz: a11e6dd9c98f59526f6f5329aab00acdcc58b5d7e2b65d83b6a1348d647a2323
 SHA512:
-  metadata.gz: a2e2ebc240b6ec293000cc023e65ed11a563ba841cb3dfafbab7e8d1ceaae0d9a21d2d9d0b556ff450495be9f20384adb27b34f68614f716aedf1e1aab9c28e4
-  data.tar.gz: 472d0209a2a24f01c8f07a7e33bdafbd85d915dbfd358f1f0799ca47ba3b34456f11d09ba67bc38874b95452f8e88d2e6540ae3ed5ab654a9cc6206a5d51cc64
+  metadata.gz: a71f194f4af63d93ee4f256977eb98525065599a36f270215c5c0f3a18cb8742957bb8f2e407497a7629f05ba18b9532d093d02b1dec305fcf4f82f815473431
+  data.tar.gz: ba25058d81d37e12594422d9a765d07fb8af192b53fe980ca3b4da3e1eac61f5a0bc69454f406be92094742e7809dbe8f4887d33e48b305c869733e5c581a4d8

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
@@ -78,7 +82,39 @@ module XcodeArchiveCache
           raise Informative, "Product of type #{built_node.native_target.product_type} not found for #{built_node.name}"
         end
 
-        [product_path]
+        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
+
+        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
@@ -106,7 +185,7 @@ module XcodeArchiveCache
         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

@@ -67,7 +67,11 @@ module XcodeArchiveCache
         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")

data/lib/build_graph/native_target_finder.rb

@@ -5,13 +5,22 @@ module XcodeArchiveCache
       # @param [Array<Xcodeproj::Project>] projects
       #
       def initialize(projects)
-        @all_targets = projects
-                           .map {|project| unnest(project)}
-                           .flatten
-                           .uniq
-                           .map(&:native_targets)
-                           .flatten
-                           .select {|target| !target.test_target_type? }
+        @all_targets = extract_targets(projects)
+      end
+
+      # @param [Array<Xcodeproj::Project>] projects
+      #
+      # @return [Array<Xcodeproj::Project::Object::PBXNativeTarget>]
+      #
+      def extract_targets(projects)
+        projects
+          .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
@@ -36,9 +45,26 @@ module XcodeArchiveCache
       #
       def find_for_file(file)
         if file.file_ref.is_a?(Xcodeproj::Project::Object::PBXReferenceProxy)
-          project = file.file_ref.remote_ref.container_portal_object
           product_reference_uuid = file.file_ref.remote_ref.remote_global_id_string
-          find_with_product_ref_uuid(project, product_reference_uuid)
+          target = find_with_product_ref_uuid(product_reference_uuid)
+          if target == nil
+            project = file.file_ref.remote_ref.container_portal_object
+            target = find_in_project(project, product_reference_uuid)
+
+            # allow all targets from this project
+            # to be linked to that exact project
+            #
+            # otherwise, injection will operate on different Xcodeproj::Project objects
+            # resulting to only the last target being actually removed
+            #
+            @all_targets += extract_targets([project])
+          end
+
+          if target == nil
+            raise Informative, "Target for #{file.file_ref.path} not found"
+          end
+
+          target
         elsif file.file_ref.is_a?(Xcodeproj::Project::Object::PBXFileReference)
           # products of sibling project targets are added as PBXFileReferences
           targets = find_with_product_path(file.file_ref.path)
@@ -54,7 +80,7 @@ module XcodeArchiveCache
       #
       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
+            .first
       end
 
       private
@@ -85,7 +111,16 @@ module XcodeArchiveCache
       #
       # @return [Xcodeproj::Project::Object::PBXNativeTarget]
       #
-      def find_with_product_ref_uuid(project, uuid)
+      def find_with_product_ref_uuid(uuid)
+        all_targets.select {|target| target.product_reference.uuid == uuid}.first
+      end
+
+      # @param [Xcodeproj::Project] project
+      # @param [String] uuid
+      #
+      # @return [Xcodeproj::Project::Object::PBXNativeTarget]
+      #
+      def find_in_project(project, uuid)
         project.native_targets.select {|target| target.product_reference.uuid == uuid}.first
       end
 

data/lib/build_graph/node.rb

@@ -34,6 +34,10 @@ module XcodeArchiveCache
       #
       attr_accessor :build_settings
 
+      # @return [Array<Xcodeproj::Project::Object::PBXNativeTarget>]
+      #
+      attr_reader :targets_injected_to
+
       # @param [String] name
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] native_target
       # @param [Boolean] is_root
@@ -44,6 +48,7 @@ module XcodeArchiveCache
         @is_root = is_root
         @dependent = []
         @dependencies = []
+        @targets_injected_to = []
         @state = :unknown
       end
 
@@ -86,9 +91,52 @@ module XcodeArchiveCache
       # @return [String]
       #
       def dsym_file_name
-        return nil unless build_settings
+        build_settings ? build_settings[XcodeArchiveCache::BuildSettings::DWARF_DSYM_FILE_NAME_KEY] : nil
+      end
+
+      # @return [String]
+      #
+      def original_modulemap_file_path
+        modulemap_file = modulemap_file_name
+        return unless modulemap_file
+
+        Pathname.new(modulemap_file).absolute? ? modulemap_file : File.join(File.dirname(native_target.project.path), modulemap_file)
+      end
+
+      # @return [String]
+      #
+      def resulting_modulemap_file_name
+        if module_name
+          module_name + ".modulemap"
+        else
+          File.basename(modulemap_file_name)
+        end
+      end
 
-        build_settings[XcodeArchiveCache::BuildSettings::DWARF_DSYM_FILE_NAME_KEY]
+      # @return [String]
+      #
+      def swift_objc_interface_header_file
+        header_file = build_settings[XcodeArchiveCache::BuildSettings::SWIFT_OBJC_INTERFACE_HEADER_NAME_KEY]
+        if header_file == nil
+          our_module_name = module_name
+          return if our_module_name == nil
+
+          header_file = our_module_name + "-Swift.h"
+        end
+
+        header_file
+      end
+
+      # @return [String]
+      #
+      def module_name
+        build_settings[XcodeArchiveCache::BuildSettings::PRODUCT_MODULE_NAME_KEY]
+      end
+
+      # @return [String]
+      #
+      def modulemap_file_name
+        build_settings[XcodeArchiveCache::BuildSettings::MODULEMAP_FILE_KEY]
       end
 
       # @return [Array<Node>]

data/lib/build_graph/rebuild_evaluator.rb

@@ -8,24 +8,50 @@ module XcodeArchiveCache
         @cache_storage = cache_storage
       end
 
+      # @param [XcodeArchiveCache::BuildGraph::Graph] graph
+      #
+      def evaluate_build_graph(graph)
+        return if graph.root_node.state != :unknown
+
+        # DFS over graph, evaluating dependencies first
+        #
+        stack = [graph.root_node]
+
+        while stack.length > 0
+          last_node = stack.last
+
+          if last_node.state == :evaluating_dependencies
+            # dependencies were evaluated, we're good to go
+            evaluate(last_node)
+            stack.delete_at(stack.length - 1)
+          elsif last_node.state == :unknown
+            last_node.state = :evaluating_dependencies
+            stack += last_node.dependencies.select { |dependency| dependency.state == :unknown }
+          else
+            stack.delete_at(stack.length - 1)
+          end
+        end
+      end
+
+      private
+
       # @param [XcodeArchiveCache::BuildGraph::Node] node
       #
       def evaluate(node)
-        return if node.state != :unknown
+        has_dependencies_waiting_for_rebuild = node.dependencies
+                                                   .reduce(false) { |rebuild, dependency| rebuild || dependency.waiting_for_rebuild }
 
         # we include dependency shas in every node sha calculation,
         # so if some dependency changes, that change propagates
         # all the way to the top level
         #
-        if cache_storage.cached_artifact_path(node) == nil
+        if has_dependencies_waiting_for_rebuild || cache_storage.cached_artifact_path(node) == nil
           node.state = :waiting_for_rebuild
         else
           node.state = :exists_in_cache
         end
       end
 
-      private
-
       # @return [XcodeArchiveCache::ArtifactCache::AbstractStorage]
       #
       attr_reader :cache_storage

data/lib/build_graph/sha_calculator.rb

@@ -2,6 +2,10 @@ module XcodeArchiveCache
   module BuildGraph
     class NodeShaCalculator
 
+      def initialize
+        @own_sha = calculate_own_sources_sha
+      end
+
       # @param [XcodeArchiveCache::BuildGraph::Node] node
       #
       def calculate(node)
@@ -24,6 +28,20 @@ module XcodeArchiveCache
 
       private
 
+      # @return [String]
+      #
+      attr_reader :own_sha
+
+      # @return [String]
+      #
+      def calculate_own_sources_sha
+        root = Pathname.new(File.expand_path('../', File.dirname(__FILE__)))
+        source_file_glob = File.join(root.realpath.to_s, "**", "*.rb")
+        source_file_paths = Dir.glob(source_file_glob)
+
+        calculate_sha(source_file_paths)
+      end
+
       # @param [XcodeArchiveCache::BuildGraph::Node] node
       #
       # @return [Array<String>]
@@ -36,6 +54,9 @@ module XcodeArchiveCache
           inputs << list_build_phase_inputs(build_phase)
         end
 
+        modulemap_file_path = node.original_modulemap_file_path
+        inputs << modulemap_file_path if modulemap_file_path
+
         # file path order should not affect evaluation result
         inputs.flatten.compact.sort
       end
@@ -71,7 +92,7 @@ module XcodeArchiveCache
       # @param [Array<String>] dependency_shas
       #
       def save_auxiliary_data(build_settings, dependency_shas, tempfile)
-        file_contents = build_settings + dependency_shas.join("\n")
+        file_contents = build_settings + dependency_shas.join("\n") + "\nXCODE-ARCHIVE-CACHE: #{own_sha}\n"
         tempfile << file_contents
         tempfile.flush
       end