xcode-archive-cache 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c3de4b956fe76ce673329ecf9977a911d3c6bb3055c00e59c3e6903cb16e6b2
-  data.tar.gz: 92253d7316a2a716b71a053f182483e7af54aeb1662111175f3e071909d79998
+  metadata.gz: 1c30a0e4a847e52d32192c31fe3cdf3c7b0ff61cabc81e413e4fe416edbda1a8
+  data.tar.gz: 31925913e15ec55cf8b94dfd9940604cbc34cc98c0f1b76317cf0d05d8c202a7
 SHA512:
-  metadata.gz: 88b0a7e44eecbdc426755761dd5df10fb0e1cff4a00c44f915df1f65515685ce3f2527d8d9b1173ea439bff032d49f4875f32a859291a702f829d378103c8234
-  data.tar.gz: c63650b58e921da5e38bb8648d0e6e3cfeddb55165e72f8984511c769a139b6ab3108350c0e684ed27ed9dbf9e02ef46135cc315a182ebc00586bb33c3fdae1f
+  metadata.gz: 5a8fcfa4fd8a2da9cfadf202aaa3be88f4c54ddf3979aa4ac1c500e61b0a9d41f07bf43420fb0ec6332fd491b634a4d4f28ff1aebeaf273c79ded3a950a0d763
+  data.tar.gz: c6f6f0351aa9b02165637e93cd65b4938f2888bdb0cb7c599f8de0592a0ae4d85092508b73fb4a2b117c226287a64ccface769afd6e4c81626cd6b8d8e253297

data/lib/build/performer.rb

@@ -6,9 +6,10 @@ module XcodeArchiveCache
 
       # @param [String] derived_data_path
       #
-      def initialize(xcodebuild_executor, derived_data_path)
+      def initialize(xcodebuild_executor, derived_data_path, workspace_path=nil)
         @xcodebuild_executor = xcodebuild_executor
         @derived_data_path = derived_data_path
+        @workspace_path = workspace_path
       end
 
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
@@ -23,7 +24,12 @@ module XcodeArchiveCache
                              .join(", ")
           info("going to rebuild:\n#{rebuild_list}")
 
-          build_result = xcodebuild_executor.build(target.project.path, target.name, derived_data_path)
+          if workspace_path
+            build_result = xcodebuild_executor.build_from_workspace(workspace_path, target.name, derived_data_path)
+          else
+            build_result = xcodebuild_executor.build_from_project(target.project.path, target.name, derived_data_path)
+          end
+
           unless build_result
             raise StandardError.new, "Failed to perform rebuild"
           end
@@ -47,6 +53,10 @@ module XcodeArchiveCache
       # @return [XcodeArchiveCache::Xcodebuild::Executor]
       #
       attr_reader :xcodebuild_executor
+
+      # @return [String]
+      #
+      attr_reader :workspace_path
     end
   end
 end

data/lib/build/product_extractor.rb

@@ -122,10 +122,12 @@ module XcodeArchiveCache
       # @return [String]
       #
       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
-        get_product_glob(File.basename(product_name))
+        product_names = [File.basename(built_node.native_target.product_reference.path)]
+        if built_node.native_target.product_reference.name
+          product_names.push(File.basename(built_node.native_target.product_reference.name))
+        end
+
+        get_product_glob(product_names.select { |name| File.extname(name).length > 0 })
       end
 
       # @param [XcodeArchiveCache::BuildGraph::Node] built_node
@@ -133,7 +135,7 @@ module XcodeArchiveCache
       # @return [String]
       #
       def get_swift_objc_interface_header_glob(built_node)
-        get_product_glob(File.basename(built_node.swift_objc_interface_header_file))
+        get_product_glob([File.basename(built_node.swift_objc_interface_header_file)])
       end
 
       # @param [XcodeArchiveCache::BuildGraph::Node] built_node
@@ -142,7 +144,7 @@ module XcodeArchiveCache
       #
       def get_swiftmodule_glob(built_node)
         if built_node.module_name
-          get_product_glob(built_node.module_name + ".swiftmodule")
+          get_product_glob([built_node.module_name + ".swiftmodule"])
         end
       end
 
@@ -153,24 +155,24 @@ module XcodeArchiveCache
       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)
+          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)
+            get_product_glob([modulemap_file_name])
           end
         end
       end
 
-      # @param [String] file_name
+      # @param [Array<String>] file_names
       #
       # @return [String]
       #
-      def get_product_glob(file_name)
+      def get_product_glob(file_names)
         File.join(derived_data_path,
                   "**",
-                  file_name)
+                  "{#{file_names.join(",")}}")
       end
 
       # @param [String] framework_path

data/lib/build_graph/native_target_finder.rb

@@ -123,7 +123,7 @@ module XcodeArchiveCache
       #
       def find_for_product_name(product_name)
         canonical = all_targets
-          .select {|native_target| native_target.name == product_name || native_target.product_reference.display_name == product_name}
+          .select {|native_target| native_target.name == product_name || native_target.product_reference.display_name == product_name || native_target.product_reference.path == product_name }
           .first
         
         parsed = @product_name_to_target[product_name]

data/lib/build_settings/filter.rb

@@ -93,7 +93,6 @@ module XcodeArchiveCache
         CLONE_HEADERS
         COMBINE_HIDPI_IMAGES
         COMPRESS_PNG_FILES
-        CONFIGURATION
         COPYING_PRESERVES_HFS_DATA
         COPY_HEADERS_RUN_UNIFDEF
         COPY_PHASE_STRIP

data/lib/injection/injector.rb

@@ -13,7 +13,7 @@ module XcodeArchiveCache
         @headers_mover = HeadersMover.new(storage)
         @dependency_remover = DependencyRemover.new
         @build_flags_changer = BuildFlagsChanger.new
-        @pods_fixer = PodsScriptFixer.new
+        @pods_fixer = PodsScriptFixer.new(storage)
         @modulemap_fixer = XcodeArchiveCache::Modulemap::HeaderPathFixer.new(storage)
         @framework_embedder = FrameworkEmbedder.new
       end
@@ -55,8 +55,8 @@ module XcodeArchiveCache
         # are covered by "Embed Pods Frameworks" script
         #
         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)
+          pods_fixer.fix_embed_frameworks_script(target, graph)
+          pods_fixer.fix_copy_resources_script(target, graph)
         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) }

data/lib/injection/pods_script_fixer.rb

@@ -4,36 +4,41 @@ module XcodeArchiveCache
 
       include XcodeArchiveCache::Logs
 
-      def initialize
+      # @param [XcodeArchiveCache::Injection::Storage] storage
+      #
+      def initialize(storage)
+        @storage = storage
         @build_settings_interpolator = XcodeArchiveCache::BuildSettings::StringInterpolator.new
       end
 
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
       # @param [XcodeArchiveCache::BuildGraph::Graph] graph
-      # @param [String] products_dir
       #
-      def fix_embed_frameworks_script(target, graph, products_dir)
+      def fix_embed_frameworks_script(target, graph)
         build_settings = graph.dependent_build_settings
         file_path = find_embed_frameworks_script(target, build_settings)
         return unless file_path
 
-        fix_script(file_path, graph, products_dir)
+        fix_script(file_path, graph)
       end
 
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
       # @param [XcodeArchiveCache::BuildGraph::Graph] graph
-      # @param [String] products_dir
       #
-      def fix_copy_resources_script(target, graph, products_dir)
+      def fix_copy_resources_script(target, graph)
         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)
+        fix_script(file_path, graph)
       end
 
       private
 
+      # @return [XcodeArchiveCache::Injection::Storage]
+      #
+      attr_reader :storage
+
       # @return [XcodeArchiveCache::BuildSettings::StringInterpolator]
       #
       attr_reader :build_settings_interpolator
@@ -57,16 +62,14 @@ module XcodeArchiveCache
       end
 
       # @param [String] file_path
-      # @param [XcodeArchiveCache::BuildGraph::Node] graph
-      # @param [String] products_dir
+      # @param [XcodeArchiveCache::BuildGraph::Graph] graph
       #
-      def fix_script(file_path, graph, products_dir)
+      def fix_script(file_path, graph)
         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}\"")
+          product_path = File.join(storage.get_storage_path(node), node.product_file_name)
+          script = script.gsub(Regexp.new("\"[^\"]+\/#{node.product_file_name}\""), "\"#{product_path}\"")
         end
 
         File.open(file_path, "w") {|file| file.puts(script)}

data/lib/injection/pods_xcframework_fixer.rb

@@ -18,7 +18,7 @@ module XcodeArchiveCache
       end
 
       # @param [Xcodeproj::Project::Object::PBXAbstractTarget] target
-      # @param [XcodeArchiveCache::BuildSettings::Container] build_settings
+      # @param [XcodeArchiveCache::BuildSettings::Loader] build_settings_loader
       #
       def fix(target, build_settings_loader)
         checked_targets.push(target.equatable_identifier)

data/lib/injection/storage.rb

@@ -77,7 +77,7 @@ module XcodeArchiveCache
       def prepare_storage(node)
         path = get_storage_path(node)
         if File.exist?(path)
-          raise StandardError.new, "Injection storage path is already busy"
+          raise StandardError.new, "Injection storage path is already busy: #{path}"
         end
 
         FileUtils.mkdir_p(path)
@@ -89,7 +89,12 @@ module XcodeArchiveCache
       # @return [String]
       #
       def get_storage_path(node)
-        File.join(container_dir_path, node.name)
+        path = File.join(container_dir_path, node.name)
+        if node.native_target
+          path += "-#{node.native_target.uuid}"
+        end
+
+        path
       end
 
       # @param [XcodeArchiveCache::BuildGraph::Node] node

data/lib/runner/runner.rb

@@ -133,7 +133,8 @@ module XcodeArchiveCache
     # @param [XcodeArchiveCache::BuildGraph::Graph] graph
     #
     def rebuild_if_needed(xcodebuild_executor, root_target, graph)
-      rebuild_performer = XcodeArchiveCache::Build::Performer.new(xcodebuild_executor, config.settings.derived_data_path)
+      workspace_path = config.is_a?(XcodeArchiveCache::Config::Workspace) ? File.absolute_path(config.file_path) : nil
+      rebuild_performer = XcodeArchiveCache::Build::Performer.new(xcodebuild_executor, config.settings.derived_data_path, workspace_path)
       return unless rebuild_performer.should_rebuild?(graph)
 
       @injector.perform_internal_injection(graph)

data/lib/xcodebuild/executor.rb

@@ -43,8 +43,30 @@ module XcodeArchiveCache
       # @param [String] scheme
       # @param [String] derived_data_path
       #
-      def build(project_path, scheme, derived_data_path)
-        flags = [project_flag(project_path),
+      def build_from_project(project_path, scheme, derived_data_path)
+        build(project_flag(project_path), scheme, derived_data_path)
+      end
+
+      # @param [String] workspace_flag
+      # @param [String] scheme
+      # @param [String] derived_data_path
+      #
+      def build_from_workspace(workspace_path, scheme, derived_data_path)
+        build(workspace_flag(workspace_path), scheme, derived_data_path)
+      end
+
+      def set_up_for_simulator?
+        destination_flag.include?("Simulator")
+      end
+
+      private
+
+      # @param [String] path_flag
+      # @param [String] scheme
+      # @param [String] derived_data_path
+      #
+      def build(path_flag, scheme, derived_data_path)
+        flags = [path_flag,
                  configuration_flag,
                  destination_flag,
                  scheme_flag(scheme),
@@ -55,12 +77,6 @@ module XcodeArchiveCache
         shell_executor.execute(command, true)
       end
 
-      def set_up_for_simulator?
-        destination_flag.include?("Simulator")
-      end
-
-      private
-
       # @return [String]
       #
       attr_reader :configuration
@@ -93,6 +109,14 @@ module XcodeArchiveCache
         "xcodebuild #{flags.join(" ")}"
       end
 
+      # @param [String] workspace_path
+      #
+      # @return [String]
+      #
+      def workspace_flag(workspace_path)
+        "-workspace '#{workspace_path}'"
+      end
+
       # @param [String] project_path
       #
       # @return [String]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-archive-cache
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Ilya Dyakonov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2022-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: Native targets cache for Xcode archive builds.