xcode-archive-cache 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49b93ea668f7de9a3723feec1518e934f0b46755afaf941866cf028ed0cc7f0b
-  data.tar.gz: 16c0538e9665fe7f7c95c747d34f8ae48a3d8c2c5ed7adb1cc865dbbcbe0c43f
+  metadata.gz: 95a23e762c8efb7296e5d0faa4387c4ed39f4e373a821437f0440e7bdf759d8f
+  data.tar.gz: 933fae20075b13c5447217e38f917a35c8b42b9999076316ffdb264043e6b532
 SHA512:
-  metadata.gz: 07424e1f9f50852d8d3a2fb873454d6e441860d33d220a6b37aeb11bb5dd6e90a872bbd37f8c749bb3b0e6a0693fe9aab8fb6c344f7294127861f7ddd9321e8f
-  data.tar.gz: 670815a9f5e0bf971f5f0868e42bdeb0b2d0f12b745572688c0022914f57d6d0ba3016cddd54b5aca92203101df21c52b84d6c01de9c080bfa6eb3be1e9b0273
+  metadata.gz: 926f44d73815c5bdaf3e535bbb01e0c3d7aaa8a1c1e813baf054d85e1ab08904b2066975be0866c51f6e474a7ce3a2236c044c1a06486adc480b4eaf90d9ba2b
+  data.tar.gz: 81d379f00051d87a5c6440a9f5c6648fedad99d75c36f39f21f59443c786de4b614e2ecd37f7d2014643b99bac9e8a2dbcb0637decdb114772d59f9779e23e43

data/lib/artifact_cache/local_storage.rb

@@ -18,6 +18,9 @@ module XcodeArchiveCache
         File.exist?(path) ? path : nil
       end
 
+      # @param [XcodeArchiveCache::BuildGraph::Node] node
+      # @param [String] path
+      #
       def store(node, path)
         archive_path = path_inside_cache_dir(node)
         archive_directory = File.expand_path("..", archive_path)
@@ -26,6 +29,7 @@ module XcodeArchiveCache
         end
 
         archiver.archive(path, archive_path)
+        save_state(node, archive_path)
       end
 
       private
@@ -38,9 +42,34 @@ module XcodeArchiveCache
       #
       attr_reader :archiver
 
+      # @param [XcodeArchiveCache::BuildGraph::Node] node
+      #
+      # @return [String]
+      #
       def path_inside_cache_dir(node)
         File.join(cache_dir_path, node.name, node.sha)
       end
+
+      # @param [XcodeArchiveCache::BuildGraph::Node] node
+      # @param [String] archive_path
+      #
+      # Simply writes build settings and dependency SHAs to a file
+      # Useful for debugging and investigation purposes
+      #
+      def save_state(node, archive_path)
+        state_file_path = archive_path + ".state"
+
+        if File.exist?(state_file_path)
+          raise ArgumentError.new, "State file already exists: #{state_file_path}"
+        end
+
+        dependency_shas = node.dependencies
+                              .map {|dependency| dependency.name + ": " + dependency.sha}
+                              .join("\n")
+        state = node.build_settings.filtered_to_string + "\n\nDependencies:\n" + dependency_shas + "\n"
+
+        File.write(state_file_path, state)
+      end
     end
   end
 end

data/lib/build_graph/builder.rb

@@ -19,11 +19,10 @@ module XcodeArchiveCache
       def build_graph(dependent_target, dependency_target)
         native_target_finder.set_platform_name_filter(dependency_target.platform_name)
 
-        build_settings = load_setting_for_target(dependent_target)
-        graph = Graph.new(dependency_target.project, build_settings)
+        graph = Graph.new(dependency_target.project)
 
         add_to_graph(dependency_target, graph, true)
-        load_settings(graph)
+        load_settings(graph, dependent_target)
         calculate_shas(graph)
 
         graph
@@ -122,32 +121,33 @@ module XcodeArchiveCache
       end
 
       # @param [XcodeArchiveCache::BuildGraph::Graph] graph
+      # @param [Xcodeproj::Project::Object::PBXNativeTarget] dependent_target
       #
-      def load_settings(graph)
-        counter = 1
-
-        graph.nodes.each do |node|
-          node_settings = load_setting_for_target(node.native_target)
-          unless node_settings
-            raise Informative, "No build settings loaded for #{node.name}"
-          end
-
-          node.build_settings = node_settings
-
-          debug("settings loaded for #{node.name} (#{counter} / #{graph.nodes.length})")
-          counter += 1
-        end
+      def load_settings(graph, dependent_target)
+        project_paths = graph.nodes
+                            .map {|node| node.native_target}
+                            .push(dependent_target)
+                            .map {|target| target.project.path}
+                            .sort
+                            .uniq
+        info("loading settings for #{project_paths.length} projects")
+        build_settings_loader.load_settings(project_paths)
+
+        graph.dependent_build_settings = get_settings(dependent_target)
+        graph.nodes.each {|node| node.build_settings = get_settings(node.native_target)}
       end
 
 
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
       #
-      def load_setting_for_target(target)
-        info("loading settings for #{target.display_name}")
+      def get_settings(target)
+        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}"
+        end
 
-        project_path = target.project.path
-        build_settings_loader.load_settings(project_path)
-        build_settings_loader.get_settings(project_path, target.display_name)
+        build_settings
       end
     end
   end

data/lib/build_graph/graph.rb

@@ -11,24 +11,30 @@ module XcodeArchiveCache
 
       # @return [XcodeArchiveCache::BuildSettings::Container] root target build settings
       #
-      attr_reader :dependent_build_settings
+      attr_accessor :dependent_build_settings
 
       # @param [Xcodeproj::Project] project
-      # @param [XcodeArchiveCache::BuildSettings::Container] dependent_build_settings
       #
-      def initialize(project, dependent_build_settings)
+      def initialize(project)
         @nodes = []
         @project = project
-        @dependent_build_settings = dependent_build_settings
       end
 
       # @param [String] name
       #        Native target display name
       #
+      # @return [XcodeArchiveCache::BuildGraph::Node]
+      #
       def node_by_name(name)
         nodes.select {|node| node.name == name}.first
       end
 
+      # @return [XcodeArchiveCache::BuildGraph::Node]
+      #
+      def root_node
+        nodes.select {|node| node.is_root}.first
+      end
+
       def to_s
         nodes.map(&:to_s).join("\n")
       end

data/lib/build_graph/sha_calculator.rb

@@ -14,7 +14,7 @@ module XcodeArchiveCache
         end
 
         auxiliary_file = Tempfile.new(node.name)
-        build_settings = settings_hash_to_string(node.build_settings.filtered)
+        build_settings = node.build_settings.filtered_to_string
         save_auxiliary_data(build_settings, dependency_shas, auxiliary_file)
 
         input_paths = list_input_paths(node)
@@ -66,14 +66,6 @@ module XcodeArchiveCache
         end
       end
 
-      # @param [Hash{String => String}] hash
-      #
-      # @return [String]
-      #
-      def settings_hash_to_string(hash)
-        hash.map {|name, value| "#{name} = #{value}"}.join("\n")
-      end
-
       # @param [Tempfile] tempfile
       # @param [String] build_settings
       # @param [Array<String>] dependency_shas

data/lib/build_settings/loader.rb

@@ -29,6 +29,12 @@ module XcodeArchiveCache
       def ==(other)
         other && other.all == all && other.filtered == filtered
       end
+
+      # @return [String]
+      #
+      def filtered_to_string
+        filtered.map {|name, value| "#{name} = #{value}"}.join("\n")
+      end
     end
 
     class Loader
@@ -41,21 +47,29 @@ module XcodeArchiveCache
         @settings = Hash.new
       end
 
-      # @param [String] project_path
+      # @param [Array<String>] project_paths
       #
-      # @return [Hash{String => String}]
-      #         Target build settings keyed by target name
-      #
-      def load_settings(project_path)
-        return if settings[project_path]
-
-        all_targets_settings = executor.load_build_settings(project_path)
-        settings[project_path] = extractor.extract_per_target(all_targets_settings)
+      def load_settings(project_paths)
+        paths_without_settings = project_paths.select {|path| settings[path] == nil}
+
+        threads = paths_without_settings.map do |path|
+          Thread.new(path) do |project_path|
+            Thread.current.abort_on_exception = true
+            [project_path, executor.load_build_settings(project_path)]
+          end
+        end
+
+        threads.each do |thread|
+          project_path, all_targets_settings = thread.value
+          settings[project_path] = extractor.extract_per_target(all_targets_settings)
+        end
       end
 
       # @param [String] project_path
       # @param [String] target_name
       #
+      # @return [Hash{String => String}] build settings for target or nil
+      #
       def get_settings(project_path, target_name)
         return nil unless settings[project_path]
 

data/lib/config/dsl.rb

@@ -64,6 +64,10 @@ module XcodeArchiveCache
       def cache(name)
         current_target.dependencies.push(name)
       end
+
+      def cache_itself
+        current_target.dependencies.push(current_target.name)
+      end
     end
   end
 end

data/lib/injection/framework_embedder.rb

@@ -12,6 +12,8 @@ module XcodeArchiveCache
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
       #
       def embed(framework_file_paths, target)
+        return unless target.product_type == Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application]
+
         dynamic_framework_file_paths = framework_file_paths.select do |path|
           binary_name = File.basename(path, ".framework")
           binary_path = File.join(path, binary_name)

data/lib/injection/injector.rb

@@ -29,6 +29,11 @@ module XcodeArchiveCache
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
       #
       def perform_outgoing_injection(graph, target)
+        root_node = graph.root_node
+        if root_node.native_target.project == target.project && root_node.native_target.uuid == target.uuid
+          return
+        end
+
         graph.nodes.each do |node|
           headers_mover.prepare_headers_for_injection(node)
           add_as_prebuilt_dependency(node, target, node.is_root)
@@ -61,7 +66,7 @@ module XcodeArchiveCache
       attr_reader :configuration_name
 
       # @return [Storage]
-      # 
+      #
       attr_reader :storage
 
       # @return [HeadersMover]
@@ -101,7 +106,7 @@ module XcodeArchiveCache
 
         nodes
             .select {|node| node.rebuild}
-            .each { |node|  add_header_paths_to_target(node.native_target, header_storage_paths) }
+            .each {|node| add_header_paths_to_target(node.native_target, header_storage_paths)}
       end
 
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] target

data/lib/runner/runner.rb

@@ -29,7 +29,7 @@ module XcodeArchiveCache
       file_path = File.absolute_path(config.file_path)
 
       if config.is_a?(XcodeArchiveCache::Config::Project)
-        return [Xcodeproj::Project.new(file_path)]
+        return [Xcodeproj::Project.open(file_path)]
       elsif config.is_a?(XcodeArchiveCache::Config::Workspace)
         workspace = Xcodeproj::Workspace.new_from_xcworkspace(file_path)
         workspace_dir = File.expand_path("..", file_path)
@@ -37,7 +37,7 @@ module XcodeArchiveCache
         return workspace.file_references.map {|file_reference| Xcodeproj::Project.open(file_reference.absolute_path(workspace_dir))}
       end
 
-      raise Informative, "Configuration misses no entry point -- must have either a project or a workspace"
+      raise Informative, "Configuration misses entry point -- must have either a project or a workspace"
     end
 
     def run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-archive-cache
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ilya Dyakonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-11 00:00:00.000000000 Z
+date: 2019-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -107,8 +107,9 @@ files:
 - lib/shell/executor.rb
 - lib/xcode-archive-cache.rb
 - lib/xcodebuild/executor.rb
-homepage: 
-licenses: []
+homepage: https://github.com/sweatco/xcode-archive-cache
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -118,16 +119,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
-summary: Xcode archive cache
+summary: Native targets cache for Xcode archive builds.
 test_files: []