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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95a23e762c8efb7296e5d0faa4387c4ed39f4e373a821437f0440e7bdf759d8f
-  data.tar.gz: 933fae20075b13c5447217e38f917a35c8b42b9999076316ffdb264043e6b532
+  metadata.gz: 153bd48a6899fb06dd35f7e7a6d45e81e31b10addee748cf5cd5ba56ad82ba17
+  data.tar.gz: 485fca1a778dfffe38d7d4a09315dda122c0dcc08c828999f2559bf35d750c52
 SHA512:
-  metadata.gz: 926f44d73815c5bdaf3e535bbb01e0c3d7aaa8a1c1e813baf054d85e1ab08904b2066975be0866c51f6e474a7ce3a2236c044c1a06486adc480b4eaf90d9ba2b
-  data.tar.gz: 81d379f00051d87a5c6440a9f5c6648fedad99d75c36f39f21f59443c786de4b614e2ecd37f7d2014643b99bac9e8a2dbcb0637decdb114772d59f9779e23e43
+  metadata.gz: 154fa88f04f1e01f0faae4155ff4f0dd558de0c2dce805728bd42ff77fbe5944c84d16fd8a4221279183e22c3a9eb0741429382c834ce1a2662413fcc83fdca7
+  data.tar.gz: 6ba834613e56bd982e2d36bd5a7828b6f527b743fc40b7d577b3af69e573c7ebdb3aa506c51b1a222fcb7122a58e40be8ec3ef7702614d7729d1cd6066d1bda6

data/lib/build/performer.rb

@@ -11,14 +11,16 @@ module XcodeArchiveCache
         @derived_data_path = derived_data_path
       end
 
-      # @param [String] configuration
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
       # @param [XcodeArchiveCache::BuildGraph::Graph] graph
       #
       def rebuild_missing(target, graph)
         should_rebuild_anything = should_rebuild?(graph)
         if should_rebuild_anything
-          rebuild_list = graph.nodes.select(&:rebuild).map(&:name).join(", ")
+          rebuild_list = graph.nodes
+                             .select(&:waiting_for_rebuild)
+                             .map(&:name)
+                             .join(", ")
           info("going to rebuild:\n#{rebuild_list}")
 
           build_result = xcodebuild_executor.build(target.project.path, target.name, derived_data_path)
@@ -33,7 +35,7 @@ module XcodeArchiveCache
       # @param [XcodeArchiveCache::BuildGraph::Graph] graph
       #
       def should_rebuild?(graph)
-        graph.nodes.reduce(false) {|rebuild, node| rebuild || node.rebuild}
+        graph.nodes.reduce(false) {|rebuild, node| rebuild || node.waiting_for_rebuild}
       end
 
       private
@@ -42,6 +44,8 @@ module XcodeArchiveCache
       #
       attr_reader :derived_data_path
 
+      # @return [XcodeArchiveCache::Xcodebuild::Executor]
+      #
       attr_reader :xcodebuild_executor
     end
   end

data/lib/build_graph/builder.rb

@@ -20,7 +20,6 @@ module XcodeArchiveCache
         native_target_finder.set_platform_name_filter(dependency_target.platform_name)
 
         graph = Graph.new(dependency_target.project)
-
         add_to_graph(dependency_target, graph, true)
         load_settings(graph, dependent_target)
         calculate_shas(graph)
@@ -30,6 +29,8 @@ module XcodeArchiveCache
 
       private
 
+      ALL_NODES = []
+
       # @return [XcodeArchiveCache::BuildSettings::Loader]
       #
       attr_accessor :build_settings_loader
@@ -58,25 +59,21 @@ module XcodeArchiveCache
         end
 
         display_name = target.display_name
-        existing_node = graph.node_by_name(display_name)
-        if existing_node
-          debug("already added this one")
-          return existing_node
-        end
-
         if target_stack.include?(display_name)
           target_stack.push(display_name)
           raise Informative, "Circular dependency detected: #{target_stack.join(" -> ")}"
         end
 
-        node = graph.node_by_name(display_name)
+        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)
           return node
         else
           debug("adding new node")
           node = Node.new(display_name, target, is_root)
           graph.nodes.push(node)
+          ALL_NODES.push(node)
         end
 
         dependencies = []

data/lib/build_graph/graph.rb

@@ -29,6 +29,10 @@ module XcodeArchiveCache
         nodes.select {|node| node.name == name}.first
       end
 
+      def add_multiple_nodes(new_nodes)
+        @nodes += new_nodes
+      end
+
       # @return [XcodeArchiveCache::BuildGraph::Node]
       #
       def root_node

data/lib/build_graph/node.rb

@@ -10,9 +10,9 @@ module XcodeArchiveCache
       #
       attr_reader :is_root
 
-      # @return [Bool] should target be rebuilt
+      # @return [Symbol] should target be rebuilt
       #
-      attr_accessor :rebuild
+      attr_accessor :state
 
       # @return [String] sha256 of (input files + build settings + dependency shas)
       #
@@ -44,6 +44,7 @@ module XcodeArchiveCache
         @is_root = is_root
         @dependent = []
         @dependencies = []
+        @state = :unknown
       end
 
       def has_framework_product?
@@ -89,6 +90,18 @@ module XcodeArchiveCache
         (dependent + dependent.map(&:all_dependent_nodes)).flatten.uniq
       end
 
+      # @return [Array<Node>]
+      #
+      def subgraph
+        ([self] + dependencies + dependencies.map(&:subgraph)).flatten.uniq
+      end
+
+      # @return [Bool]
+      #
+      def waiting_for_rebuild
+        state == :waiting_for_rebuild
+      end
+
       def ==(other_node)
         other_node && native_target.uuid == other_node.native_target.uuid && native_target.project == other_node.native_target.project
       end
@@ -97,7 +110,7 @@ module XcodeArchiveCache
         sha_string = sha ? sha : "<none>"
         dependent_names = dependent.length > 0 ? dependent.map(&:name).join(", ") : "<none>"
         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\trebuild: #{rebuild}\n\tdependent: #{dependent_names}\n\tdependencies: #{dependency_names}"
+        "#{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
     end
   end

data/lib/build_graph/rebuild_evaluator.rb

@@ -11,13 +11,17 @@ module XcodeArchiveCache
       # @param [XcodeArchiveCache::BuildGraph::Node] node
       #
       def evaluate(node)
-        return if node.rebuild != nil
+        return if node.state != :unknown
 
         # we include dependency shas in every node sha calculation,
         # so if some dependency changes, that change propagates
         # all the way to the top level
         #
-        node.rebuild = cache_storage.cached_artifact_path(node) == nil
+        if cache_storage.cached_artifact_path(node) == nil
+          node.state = :waiting_for_rebuild
+        else
+          node.state = :exists_in_cache
+        end
       end
 
       private

data/lib/build_settings/loader.rb

@@ -39,18 +39,17 @@ module XcodeArchiveCache
 
     class Loader
 
-      # @param [Xcodebuild::Executor.new] executor
+      # @param [Xcodebuild::Executor] executor
       #
       def initialize(executor)
         @executor = executor
         @extractor = Extractor.new
-        @settings = Hash.new
       end
 
       # @param [Array<String>] project_paths
       #
       def load_settings(project_paths)
-        paths_without_settings = project_paths.select {|path| settings[path] == nil}
+        paths_without_settings = project_paths.select {|path| get_project_settings(path) == nil}
 
         threads = paths_without_settings.map do |path|
           Thread.new(path) do |project_path|
@@ -61,7 +60,8 @@ module XcodeArchiveCache
 
         threads.each do |thread|
           project_path, all_targets_settings = thread.value
-          settings[project_path] = extractor.extract_per_target(all_targets_settings)
+          per_target_settings = extractor.extract_per_target(all_targets_settings)
+          set_project_settings(project_path, per_target_settings)
         end
       end
 
@@ -71,13 +71,16 @@ module XcodeArchiveCache
       # @return [Hash{String => String}] build settings for target or nil
       #
       def get_settings(project_path, target_name)
-        return nil unless settings[project_path]
+        project_settings = get_project_settings(project_path)
+        return nil unless project_settings
 
-        settings[project_path][target_name]
+        project_settings[target_name]
       end
 
       private
 
+      SETTINGS = Hash.new
+
       # @return [XcodeArchiveCache::Xcodebuild::Executor]
       #
       attr_reader :executor
@@ -86,9 +89,28 @@ module XcodeArchiveCache
       #
       attr_reader :extractor
 
-      # @return [Hash{String => Hash}]
+      # @param [String] path
+      #
+      # @return [Hash]
+      #
+      def get_project_settings(path)
+        SETTINGS[get_project_key(path)]
+      end
+
+      # @param [String] path
+      # @param [Hash] per_target_settings
+      #
+      def set_project_settings(path, per_target_settings)
+        SETTINGS[get_project_key(path)] = per_target_settings
+      end
+
+      # @param [String] project_path
       #
-      attr_reader :settings
+      # @return [String]
+      #
+      def get_project_key(project_path)
+        "#{project_path}-#{executor.arguments_state}"
+      end
     end
   end
 end

data/lib/injection/injector.rb

@@ -20,7 +20,7 @@ module XcodeArchiveCache
       # @param [XcodeArchiveCache::BuildGraph::Graph] graph
       #
       def perform_internal_injection(graph)
-        inject_cached(graph.nodes)
+        inject_unpacked(graph.nodes)
         add_header_paths(graph.nodes)
         save_graph_projects(graph)
       end
@@ -91,8 +91,8 @@ module XcodeArchiveCache
 
       # @param [Array<XcodeArchiveCache::BuildGraph::Node>] nodes
       #
-      def inject_cached(nodes)
-        cached_nodes = nodes.select {|node| !node.rebuild}
+      def inject_unpacked(nodes)
+        cached_nodes = nodes.select {|node| node.state == :unpacked}
         cached_nodes.each do |node|
           headers_mover.prepare_headers_for_injection(node)
           add_as_prebuilt_to_dependents(node)
@@ -105,7 +105,7 @@ module XcodeArchiveCache
         header_storage_paths = storage.get_all_headers_storage_paths
 
         nodes
-            .select {|node| node.rebuild}
+            .select(&:waiting_for_rebuild)
             .each {|node| add_header_paths_to_target(node.native_target, header_storage_paths)}
       end
 
@@ -130,7 +130,7 @@ module XcodeArchiveCache
       def add_as_prebuilt_to_dependents(prebuilt_node)
         dependent_to_rebuild = prebuilt_node
                                    .all_dependent_nodes
-                                   .select {|node| node.rebuild}
+                                   .select(&:waiting_for_rebuild)
         dependent_to_rebuild.each do |dependent_node|
           should_link = prebuilt_node.dependent.include?(dependent_node)
           add_as_prebuilt_dependency(prebuilt_node, dependent_node.native_target, should_link)

data/lib/injection/pods_script_fixer.rb

@@ -46,7 +46,9 @@ module XcodeArchiveCache
                        .strip
           end
         end
+
+        nil
       end
     end
   end
-end
+end

data/lib/runner/runner.rb

@@ -93,7 +93,7 @@ module XcodeArchiveCache
       graph = graph_builder.build_graph(target, dependency_target)
 
       evaluate_for_rebuild(graph)
-      extract_cached_artifacts(graph)
+      unpack_cached_artifacts(graph)
       rebuild_if_needed(xcodebuild_executor, dependency_target, graph)
       @injector.perform_outgoing_injection(graph, target)
     end
@@ -108,12 +108,13 @@ module XcodeArchiveCache
 
     # @param [XcodeArchiveCache::BuildGraph::Graph] graph
     #
-    def extract_cached_artifacts(graph)
-      graph.nodes.each do |node|
-        next if node.rebuild
-
+    def unpack_cached_artifacts(graph)
+      graph.nodes
+          .select {|node| node.state == :exists_in_cache}
+          .each do |node|
         destination = @injection_storage.prepare_storage(node)
         @artifact_extractor.unpack(node, destination)
+        node.state = :unpacked
       end
     end
 
@@ -127,12 +128,13 @@ module XcodeArchiveCache
       @injector.perform_internal_injection(graph)
       rebuild_performer.rebuild_missing(root_target, graph)
 
-      graph.nodes.each do |node|
-        next unless node.rebuild
-
+      graph.nodes
+          .select(&:waiting_for_rebuild)
+          .each do |node|
         file_paths = @product_extractor.list_product_contents(root_target.name, node)
         @injection_storage.store_products(node, file_paths)
         @cache_storage.store(node, @injection_storage.get_storage_path(node))
+        node.state = :rebuilt_and_cached
       end
     end
   end

data/lib/xcodebuild/executor.rb

@@ -4,6 +4,11 @@ module XcodeArchiveCache
     GENERIC_DESTINATION = "generic"
 
     class Executor
+
+      # @return [String]
+      #
+      attr_reader :arguments_state
+
       # @param [String] configuration
       # @param [String] platform
       # @param [String] destination
@@ -17,6 +22,7 @@ module XcodeArchiveCache
         @action = action
         @args = args
         @shell_executor = XcodeArchiveCache::Shell::Executor.new
+        @arguments_state = "#{configuration}-#{platform}-#{destination}-#{action}-#{args}"
       end
 
       # @param [String] project_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-archive-cache
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8.pre.1
 platform: ruby
 authors:
 - Ilya Dyakonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2019-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -122,9 +122,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.4
 signing_key: