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

data/lib/injection/storage.rb

@@ -23,18 +23,42 @@ module XcodeArchiveCache
       # @param [String] path
       # @param [Array<String>] file_paths
       #
-      def store_headers(node, path, file_paths)
-        storage_path = get_full_header_storage_path(path)
+      def store_headers(node, path, file_paths, save_path = true)
+        storage_path = Pathname.new(path).absolute? ? path : get_full_header_storage_path(path)
 
         unless File.exist?(storage_path)
           FileUtils.mkdir_p(storage_path)
         end
 
         file_paths.each do |file_path|
-          FileUtils.cp(file_path, File.join(storage_path, File.basename(file_path)))
+          FileUtils.cp(file_path, get_stored_file_path(storage_path, file_path))
         end
 
-        save_header_storage_path(storage_path, node)
+        save_header_storage_path(storage_path, node) if save_path
+      end
+
+      # @param [XcodeArchiveCache::BuildGraph::Node] node
+      # @param [Array<String>] file_paths
+      #
+      def store_default_headers(node, file_paths)
+        store_headers(node, get_default_headers_storage_path(node), file_paths)
+      end
+
+      def store_modulemap_headers(node, file_paths)
+        store_headers(node, get_storage_path(node), file_paths, false)
+      end
+
+      # @param [XcodeArchiveCache::BuildGraph::Node] node
+      #
+      # @return [String]
+      #
+      def get_modulemap_path(node)
+        modulemap_file_name = node.resulting_modulemap_file_name
+        return if modulemap_file_name == nil
+
+        storage_path = get_storage_path(node)
+        stored_modulemap_file_path = get_stored_file_path(storage_path, modulemap_file_name)
+        File.exist?(stored_modulemap_file_path) ? stored_modulemap_file_path : nil
       end
 
       # @param [XcodeArchiveCache::BuildGraph::Node] node
@@ -70,7 +94,7 @@ module XcodeArchiveCache
 
       # @param [XcodeArchiveCache::BuildGraph::Node] node
       #
-      # @return [Array<String>]
+      # @return [String]
       #
       def get_headers_storage_paths(node)
         headers_storage_dir_paths[node.name]
@@ -78,11 +102,19 @@ module XcodeArchiveCache
 
       def get_all_headers_storage_paths
         headers_storage_dir_paths
-            .map {|_, path| path}
+            .map { |_, path| path }
             .flatten
             .uniq
       end
 
+      # @param [XcodeArchiveCache::BuildGraph::Node] node
+      #
+      # @return [String]
+      #
+      def get_default_headers_storage_path(node)
+        "include/#{node.name}"
+      end
+
       private
 
       def prepare_container_dir
@@ -99,6 +131,15 @@ module XcodeArchiveCache
         File.absolute_path(path, container_dir_path)
       end
 
+      # @param [String] storage_path
+      # @param [String] file_path
+      #
+      # @return [String]
+      #
+      def get_stored_file_path(storage_path, file_path)
+        File.join(storage_path, File.basename(file_path))
+      end
+
       # @param [String] path
       # @param [XcodeArchiveCache::BuildGraph::Node] node
       #

data/lib/modulemap/file_handler.rb

@@ -0,0 +1,20 @@
+module XcodeArchiveCache
+  module Modulemap
+    class FileHandler
+      # @param [String] modulemap_path
+      #
+      # @return [Array<String>]
+      #
+      def read_modulemap_lines(modulemap_path)
+        File.read(modulemap_path).split("\n")
+      end
+
+      # @param [Array<String>] lines
+      # @param [String] modulemap_path
+      #
+      def write_modulemap_lines(lines, modulemap_path)
+        File.open(modulemap_path, "w") { |file| file.puts lines.join("\n") }
+      end
+    end
+  end
+end

data/lib/modulemap/header_path_extractor.rb

@@ -0,0 +1,67 @@
+module XcodeArchiveCache
+  module Modulemap
+    class HeaderPathDeclaration
+      # @return [String]
+      #
+      attr_reader :type
+
+      # @return [String]
+      #
+      attr_reader :path
+
+      # @param [String] type
+      # @param [String] path
+      #
+      def initialize(type, path)
+        @type = type
+        @path = path
+      end
+    end
+
+    class HeaderPathExtractor
+
+      include XcodeArchiveCache::Logs
+
+      # @param [String] modulemap_path
+      #
+      # @return [Array<String>]
+      #
+      def extract_all_paths(modulemap_path)
+        modulemap_dir = File.dirname(modulemap_path)
+        modulemap_lines = FileHandler.new.read_modulemap_lines(modulemap_path)
+        header_paths = []
+
+        modulemap_lines.each do |line|
+          header_declaration = extract_header_declaration(line)
+          if header_declaration
+            header_paths << get_full_header_path(modulemap_dir, header_declaration.path)
+          end
+        end
+
+        debug("modulemap header paths: #{header_paths}")
+
+        header_paths
+      end
+
+      # @param [String] modulemap_dir
+      # @param [String] path
+      #
+      # @return [String]
+      #
+      def get_full_header_path(modulemap_dir, path)
+        Pathname.new(path).absolute? ? path : File.join(modulemap_dir, path)
+      end
+
+      # @param [String] line
+      #
+      # @return [XcodeArchiveCache::Modulemap::HeaderPathDeclaration]
+      #
+      def extract_header_declaration(line)
+        if line.include?("header") && !line.include?("exclude")
+          components = line.split("\"")
+          HeaderPathDeclaration.new(components[0], components[1])
+        end
+      end
+    end
+  end
+end

data/lib/modulemap/header_path_fixer.rb

@@ -0,0 +1,65 @@
+module XcodeArchiveCache
+  module Modulemap
+    class HeaderPathFixer
+
+      include XcodeArchiveCache::Logs
+
+      # @param [Storage] storage
+      #
+      def initialize(storage)
+        @storage = storage
+        @header_path_extractor = HeaderPathExtractor.new
+      end
+
+      # @param [XcodeArchiveCache::BuildGraph::Node] node
+      #
+      def fix_modulemap(node)
+        return unless node.has_static_library_product?
+
+        injected_modulemap_file_path = storage.get_modulemap_path(node)
+        return if injected_modulemap_file_path == nil
+
+        file_handler = FileHandler.new
+
+        modulemap_dir = File.dirname(injected_modulemap_file_path)
+        modulemap_lines = file_handler.read_modulemap_lines(injected_modulemap_file_path)
+
+        updated_lines = modulemap_lines.map do |line|
+          declaration = header_path_extractor.extract_header_declaration(line)
+          next line unless declaration
+
+          # absolute paths depend on machine and derived data dir
+          #
+          full_header_path = header_path_extractor.get_full_header_path(modulemap_dir, declaration.path)
+          should_replace = Pathname.new(declaration.path).absolute? || !File.exist?(full_header_path)
+          next line unless should_replace
+
+          header_file_name = File.basename(declaration.path)
+          injected_header_path = File.join(modulemap_dir, header_file_name)
+          next line if injected_header_path == declaration.path
+
+          if File.exist?(injected_header_path)
+            debug("substituting #{declaration.path} with #{injected_header_path} in #{File.basename(injected_modulemap_file_path)}")
+            "#{declaration.type}\"#{injected_header_path}\""
+          else
+            error("failed to substitute missing header #{declaration.path} with another missing header in #{File.basename(injected_modulemap_file_path)}")
+            error("leaving the path as it is")
+            line
+          end
+        end
+
+        file_handler.write_modulemap_lines(updated_lines, injected_modulemap_file_path)
+      end
+
+      private
+
+      # @return [Storage]
+      #
+      attr_accessor :storage
+
+      # @return [XcodeArchiveCache::Modulemap::HeaderPathExtractor]
+      #
+      attr_accessor :header_path_extractor
+    end
+  end
+end

data/lib/runner/runner.rb

@@ -68,42 +68,49 @@ module XcodeArchiveCache
         raise Informative, "Target not found for #{target_config.name}"
       end
 
+      xcodebuild_executor = XcodeArchiveCache::Xcodebuild::Executor.new(config.active_configuration.build_configuration,
+                                                                        target.platform_name,
+                                                                        config.settings.destination,
+                                                                        config.active_configuration.action,
+                                                                        config.active_configuration.xcodebuild_args)
+      graph_builder = XcodeArchiveCache::BuildGraph::Builder.new(@native_target_finder, xcodebuild_executor)
+
+      dependency_targets = Hash.new
+      build_graphs = Hash.new
+
+      target_config.dependencies.each do |dependency_name|
+        info("creating build graph for #{dependency_name}")
+
+        dependency_target = find_dependency_target(target, dependency_name)
+        dependency_targets[dependency_name] = dependency_target
+        build_graphs[dependency_name] = graph_builder.build_graph(target, dependency_target)
+      end
+
       target_config.dependencies.each do |dependency_name|
-        handle_dependency(target, dependency_name)
+        info("processing #{dependency_name}")
+
+        dependency_target = dependency_targets[dependency_name]
+        build_graph = build_graphs[dependency_name]
+        
+        @rebuild_evaluator.evaluate_build_graph(build_graph)
+        unpack_cached_artifacts(build_graph)
+        rebuild_if_needed(xcodebuild_executor, dependency_target, build_graph)
+        @injector.perform_outgoing_injection(build_graph, target)
       end
     end
 
     # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
     # @param [String] dependency_name
     #
-    def handle_dependency(target, dependency_name)
-      info("checking #{dependency_name}")
-
+    # @return [Xcodeproj::Project::Object::PBXNativeTarget]
+    #
+    def find_dependency_target(target, dependency_name)
       dependency_target = @native_target_finder.find_for_product_name(dependency_name)
       unless dependency_target
         raise Informative, "Target not found for #{dependency_name} of #{target.display_name}"
       end
 
-      xcodebuild_executor = XcodeArchiveCache::Xcodebuild::Executor.new(config.active_configuration.build_configuration,
-                                                                        dependency_target.platform_name,
-                                                                        config.settings.destination,
-                                                                        config.active_configuration.action,
-                                                                        config.active_configuration.xcodebuild_args)
-      graph_builder = XcodeArchiveCache::BuildGraph::Builder.new(@native_target_finder, xcodebuild_executor)
-      graph = graph_builder.build_graph(target, dependency_target)
-
-      evaluate_for_rebuild(graph)
-      unpack_cached_artifacts(graph)
-      rebuild_if_needed(xcodebuild_executor, dependency_target, graph)
-      @injector.perform_outgoing_injection(graph, target)
-    end
-
-    # @param [XcodeArchiveCache::BuildGraph::Graph] graph
-    #
-    def evaluate_for_rebuild(graph)
-      graph.nodes.each do |node|
-        @rebuild_evaluator.evaluate(node)
-      end
+      dependency_target
     end
 
     # @param [XcodeArchiveCache::BuildGraph::Graph] graph

data/lib/shell/executor.rb

@@ -57,12 +57,12 @@ module XcodeArchiveCache
       # @return [String]
       #
       def pipefail_flags(print_command)
-        flags = %w(e o)
+        flags = ["e", "o pipefail"]
         if print_command
           flags.insert(1, "x")
         end
 
-        "-" + flags.join("")
+        "-" + flags.join(" -")
       end
     end
   end

data/lib/xcode-archive-cache.rb

@@ -46,6 +46,10 @@ require 'injection/headers_mover'
 require 'injection/storage'
 require 'injection/framework_embedder'
 
+require 'modulemap/file_handler'
+require 'modulemap/header_path_extractor'
+require 'modulemap/header_path_fixer'
+
 require 'runner/runner'
 
 require 'shell/executor'

data/lib/xcodebuild/executor.rb

@@ -55,6 +55,10 @@ module XcodeArchiveCache
         shell_executor.execute(command, true)
       end
 
+      def set_up_for_simulator?
+        destination_flag.include?("Simulator")
+      end
+
       private
 
       # @return [String]

metadata

@@ -1,43 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: xcode-archive-cache
 version: !ruby/object:Gem::Version
-  version: 0.0.8.pre.2
+  version: 0.0.10
 platform: ruby
 authors:
 - Ilya Dyakonov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-02 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.10'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: xcpretty
   requirement: !ruby/object:Gem::Requirement
@@ -66,8 +78,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: 
-email: 
+description:
+email:
 executables:
 - xcode-archive-cache
 extensions: []
@@ -103,6 +115,9 @@ files:
 - lib/injection/pods_script_fixer.rb
 - lib/injection/storage.rb
 - lib/logs/logs.rb
+- lib/modulemap/file_handler.rb
+- lib/modulemap/header_path_extractor.rb
+- lib/modulemap/header_path_fixer.rb
 - lib/runner/runner.rb
 - lib/shell/executor.rb
 - lib/xcode-archive-cache.rb
@@ -111,7 +126,7 @@ homepage: https://github.com/sweatco/xcode-archive-cache
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -122,12 +137,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Native targets cache for Xcode archive builds.
 test_files: []