xcode-archive-cache 0.0.9 → 0.0.11

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

data/lib/build_settings/extractor.rb

@@ -13,7 +13,7 @@ module XcodeArchiveCache
       # @return [Hash{String => Container}]
       #         Target build settings keyed by target name
       #
-      def extract_per_target(build_settings)
+      def extract_per_target(build_settings, fix_simulator)
         per_target_settings = build_settings.split("Build settings for action")
         result = Hash.new
 
@@ -22,6 +22,7 @@ module XcodeArchiveCache
           target_name = get_target_name(parsed_settings)
           next unless target_name
 
+          replace_platform_with_simulator(parsed_settings) if fix_simulator
           filtered_settings = filter.filter(parsed_settings)
           result[target_name] = Container.new(parsed_settings, filtered_settings)
         end
@@ -65,6 +66,27 @@ module XcodeArchiveCache
         result
       end
 
+
+      # @param [Hash{String => String}] settings
+      #
+      def replace_platform_with_simulator(settings)
+        original_platform = settings[EFFECTIVE_PLATFORM_NAME_KEY]
+        simulator_platform = settings[CORRESPONDING_SIMULATOR_PLATFORM_NAME_KEY]
+        settings[EFFECTIVE_PLATFORM_NAME_KEY] = "-#{simulator_platform}"
+        settings[PLATFORM_NAME_KEY] = simulator_platform
+
+        configuration = settings[CONFIGURATION_KEY]
+        path_regexp = Regexp.new("#{configuration}#{original_platform}")
+        simulator_path = "#{configuration}-#{simulator_platform}"
+        settings.each do |key, value|
+          settings[key] = value.gsub(path_regexp, simulator_path)
+        end
+      end
+
+      PLATFORM_NAME_KEY = "PLATFORM_NAME".freeze
+      EFFECTIVE_PLATFORM_NAME_KEY = "EFFECTIVE_PLATFORM_NAME".freeze
+      CORRESPONDING_SIMULATOR_PLATFORM_NAME_KEY = "CORRESPONDING_SIMULATOR_PLATFORM_NAME".freeze
+      CONFIGURATION_KEY = "CONFIGURATION".freeze
       TARGET_NAME_KEY = "TARGETNAME".freeze
 
       # @param [Hash{String => String}] parsed_settings

data/lib/build_settings/filter.rb

@@ -10,7 +10,7 @@ module XcodeArchiveCache
       # Machine-dependent settings i.e. paths, user names, group names are rejected
       #
       def filter(settings, settings_to_keep = SETTINGS_TO_KEEP)
-        filtered_settings = settings.select {|name, _| settings_to_keep.include?(name)}
+        filtered_settings = settings.select { |name, _| settings_to_keep.include?(name) }
         SETTINGS_TO_STRIP.each do |name|
           value = filtered_settings[name]
           next if value == nil
@@ -44,7 +44,9 @@ module XcodeArchiveCache
         # splitting will be broken, but probability of
         # someone using such path is quite low (or it isn't ?)
         #
-        value_components = value_without_quotes.split(/\s-/)
+        value_components = value_without_quotes
+                               .split(/^-|\s-/)
+                               .select { |component| component.length > 0 }
 
         index = 0
         indices_to_remove = []
@@ -66,7 +68,8 @@ module XcodeArchiveCache
           kept_components.push(component) unless indices_to_remove.include?(component_index)
         end
 
-        kept_components.join(" -")
+        result = kept_components.join(" -")
+        result.length > 0 ? "-#{result}" : ""
       end
 
       # TODO: extend
@@ -283,6 +286,7 @@ module XcodeArchiveCache
         output-file-map
         save-optimization-record-path
         working-directory
+        fmodule-map-file
         )
     end
   end

data/lib/build_settings/loader.rb

@@ -1,8 +1,15 @@
 module XcodeArchiveCache
   module BuildSettings
 
+    PRODUCT_NAME_KEY = "PRODUCT_NAME".freeze
+    TARGET_NAME_KEY = "TARGET_NAME".freeze
     FULL_PRODUCT_NAME_KEY = "FULL_PRODUCT_NAME".freeze
     DWARF_DSYM_FILE_NAME_KEY = "DWARF_DSYM_FILE_NAME".freeze
+    MODULEMAP_FILE_KEY = "MODULEMAP_FILE".freeze
+    SWIFT_OBJC_INTERFACE_HEADER_NAME_KEY = "SWIFT_OBJC_INTERFACE_HEADER_NAME".freeze
+    SWIFT_MODULE_NAME_KEY = "SWIFT_MODULE_NAME".freeze
+    PRODUCT_MODULE_NAME_KEY = "PRODUCT_MODULE_NAME".freeze
+    DERIVED_SOURCES_DIR_KEY = "DERIVED_SOURCES_DIR".freeze
 
     class Container
 
@@ -58,9 +65,11 @@ module XcodeArchiveCache
           end
         end
 
+        should_fix_settings = executor.set_up_for_simulator?
+
         threads.each do |thread|
           project_path, all_targets_settings = thread.value
-          per_target_settings = extractor.extract_per_target(all_targets_settings)
+          per_target_settings = extractor.extract_per_target(all_targets_settings, should_fix_settings)
           set_project_settings(project_path, per_target_settings)
         end
       end

data/lib/build_settings/parser.rb

@@ -1,11 +1,24 @@
 module XcodeArchiveCache
   module BuildSettings
+    class SettingEntry
+      attr_reader :name
+      attr_reader :modifiers
+      attr_reader :full_string
+
+      def initialize(name, modifiers, full_string)
+        @name = name
+        @modifiers = modifiers
+        @full_string = full_string
+      end
+    end
+
     class Parser
 
       def initialize
         @setting_name_regex = Regexp.new("^(?<#{SETTING_NAME_GROUP}>#{SETTING_NAME_CHARACTERS})\s=")
         @setting_value_regex = Regexp.new("^#{SETTING_NAME_CHARACTERS}\s=\s(?<#{SETTING_VALUE_GROUP}>.+)$")
         @setting_entry_regex = create_entry_regex
+        @setting_entry_part_regex = Regexp.new("#{SETTING_ENTRY_PART_CHARACTERS}")
         @setting_entry_name_regex = Regexp.new(SETTING_NAME_CHARACTERS)
       end
 
@@ -13,12 +26,18 @@ module XcodeArchiveCache
       #
       # @return [Array<String>]
       #
-      def find_all_names(string)
+      def find_all_entries(string)
+        return nil if string == nil
+
         string.scan(setting_entry_regex)
-            .map {|entry| entry.scan(setting_entry_name_regex).first}
-            .flatten
+            .map {|entry| 
+            parts = entry.scan(setting_entry_part_regex)
+            name = parts.first
+            modifiers = parts.drop(1)
+
+            name != nil ? SettingEntry.new(name, modifiers, entry) : nil
+          }
             .compact
-            .uniq
       end
 
       # @param [String] string
@@ -45,9 +64,9 @@ module XcodeArchiveCache
 
       # @param [String] characters
       #
-      # @return [String]
+      # @return [Regexp]
       #
-      def create_entry_regex(characters = SETTING_NAME_CHARACTERS)
+      def create_entry_regex(characters = SETTING_ALL_CHARACTERS)
         Regexp.new("\\$[({]#{characters}[)}]")
       end
 
@@ -65,10 +84,14 @@ module XcodeArchiveCache
       #
       attr_reader :setting_entry_regex
 
+      attr_reader :setting_entry_part_regex
+
       # @return [Regexp]
       #
       attr_reader :setting_entry_name_regex
 
+      SETTING_ALL_CHARACTERS = "[A-Za-z0-9_:]+".freeze
+      SETTING_ENTRY_PART_CHARACTERS = "[A-Za-z0-9_]+".freeze
       SETTING_NAME_CHARACTERS = "[A-Z0-9_]+".freeze
       SETTING_NAME_GROUP = "name".freeze
       SETTING_VALUE_GROUP = "value".freeze

data/lib/build_settings/string_interpolator.rb

@@ -12,15 +12,17 @@ module XcodeArchiveCache
       # @return [String]
       #
       def interpolate(string, build_settings)
-        names = parser.find_all_names(string)
+        return nil if string == nil
+
+        entries = parser.find_all_entries(string)
         result = string
 
-        names.each do |name|
-          value = build_settings[name]
+        entries.each do |entry|
+          value = build_settings[entry.name]
           next unless value
 
-          replacement_regex = parser.create_entry_regex(name)
-          result = result.gsub(replacement_regex, value)
+          modified_value = modify_setting_value(value, entry.modifiers)
+          result = result.gsub(entry.full_string, modified_value)
         end
 
         result
@@ -31,6 +33,20 @@ module XcodeArchiveCache
       # @return [Parser]
       #
       attr_accessor :parser
+
+      def modify_setting_value(value, modifiers)
+        modified_value = value
+
+        modifiers.each do |modifier|
+          case modifier
+          when "c99extidentifier"
+            modified_value = modified_value.gsub(/[-\s]/, "_")
+          else
+          end
+        end
+
+        modified_value
+      end
     end
   end
 end

data/lib/config/config.rb

@@ -52,7 +52,7 @@ module XcodeArchiveCache
       def active_configuration
         configuration = configurations.select{|config| config.name == active_configuration_name }.first
         if configuration == nil
-          raise Informative, "Found no configuration with name \"#{active_configuration_name}\""
+          raise XcodeArchiveCache::Informative, "Found no configuration with name \"#{active_configuration_name}\""
         end
 
         configuration
@@ -172,7 +172,7 @@ module XcodeArchiveCache
         begin
           eval(contents, nil, path)
         rescue Exception => e
-          raise Informative, "Invalid #{File.basename(path)} file: #{e.message}"
+          raise XcodeArchiveCache::Informative, "Invalid #{File.basename(path)} file: #{e.message}"
         end
       end
 

data/lib/extensions/build_configuration.rb

@@ -0,0 +1,26 @@
+module XCConfigExtensions
+  # @return [Bool]
+  #
+  def has_xcconfig?
+    base_configuration_reference != nil
+  end
+
+  # @return [String]
+  #
+  def get_xcconfig_path
+    base_configuration_reference.real_path
+  end
+end
+
+module ProjectDir
+  # @return [String]
+  #
+  def get_project_dir
+    File.dirname(project.path)
+  end
+end
+
+class Xcodeproj::Project::Object::XCBuildConfiguration
+  include XCConfigExtensions
+  include ProjectDir
+end