carthage_remote_cache 0.0.8 → 0.0.11

data/lib/version_file.rb

@@ -1,13 +1,14 @@
-require 'json'
-require 'fileutils'
+require "json"
+require "fileutils"
 
 # .version file representation, see Carthage documentation on them:
 # https://github.com/Carthage/Carthage/blob/master/Documentation/VersionFile.md
 class VersionFile
-  attr_reader :path, :version, :frameworks_by_platform
+  attr_reader :path, :platforms, :json, :version, :frameworks_by_platform
 
-  def initialize(path)
+  def initialize(path, platforms = PLATFORMS)
     @path = path
+    @platforms = platforms
     parse
   end
 
@@ -21,7 +22,7 @@ class VersionFile
   def platforms_by_framework
     result = Hash.new { |h, k| h[k] = [] }
     for framework_name in framework_names
-      @frameworks_by_platform.each do |platform, framework_names_in_platform|
+      framework_names_by_platform.each do |platform, framework_names_in_platform|
         if framework_names_in_platform.include?(framework_name)
           result[framework_name] << platform
         end
@@ -30,14 +31,18 @@ class VersionFile
     result
   end
 
+  def framework_names_by_platform
+    @frameworks_by_platform.map { |platform, framework| [platform, framework.map { |f| f.name }] }.to_h
+  end
+
   # Unique array of framework names.
   def framework_names
-    @frameworks_by_platform.values.flatten.uniq.sort
+    framework_names_by_platform.values.flatten.uniq.sort
   end
 
   # Total number of frameworks accross all platforms.
   def number_of_frameworks
-    @frameworks_by_platform.values.flatten.count
+    framework_names_by_platform.values.flatten.count
   end
 
   def move_to_build_dir
@@ -55,7 +60,7 @@ class VersionFile
     if other_version_file.nil?
       false
     else
-      FileUtils.compare_file(@path, other_version_file.path)
+      @json == other_version_file.json
     end
   end
 
@@ -64,25 +69,66 @@ class VersionFile
   def parse
     raise VersionFileDoesNotExistError.new, "File #{path} doesn't exist, has carthage been bootstrapped?" unless File.exist?(@path)
 
+    @json = read_json
+
+    @version = @json["commitish"]
+    raise AppError.new, "Version is missing in #{@path}:\n\n#{@json}" if @version.nil? || @version.empty?
+
+    @frameworks_by_platform = PLATFORMS.to_h { |platform| [platform, parse_platform(platform)] }
+  end
+
+  # Reads json from `@path` and cleans up entries, tha are not defined in `@platforms`.
+  def read_json
     file = File.read(@path)
     json = JSON.parse(file)
+    stripped_json = strip_platforms(json)
+    stripped_json
+  end
 
-    @version = json['commitish']
-    raise AppError.new, "Version is missing in #{@path}" if @version.nil? || @version.empty?
-
-    @frameworks_by_platform = {
-      :iOS => parse_platform_array(json['iOS']),
-      :macOS => parse_platform_array(json['Mac']),
-      :tvOS => parse_platform_array(json['tvOS']),
-      :watchOS => parse_platform_array(json['watchOS']),
-    }
+  def strip_platforms(json)
+    for platform in PLATFORMS
+      if !@platforms.include?(platform)
+        json[platform_to_carthage_dir_string(platform)] = []
+      end
+    end
+    json
   end
 
-  def parse_platform_array(array)
-    if array.kind_of?(Array)
-      array.map { |entry| entry['name'] }
+  def parse_platform(platform)
+    carthage_platform_name = platform_to_carthage_dir_string(platform)
+    array = @json[carthage_platform_name]
+    if array.kind_of?(Array) and array.count > 0
+      if array.first["linking"]
+        parse_frameworks(array)
+      elsif array.first["container"]
+        parse_xcframeworks(array)
+      else
+        raise AppError.new "Failed to parse framework #{json}"
+      end
     else
       []
     end
   end
+
+  def parse_frameworks(array)
+    array.map { |json| Framework.parse(json) }
+  end
+
+  def parse_xcframeworks(array)
+    # Parse the array of XCFrameworks
+    xcframeworks = array.map { |json| XCFramework.parse(json) }
+
+    # Merge entries with same name, but different identifiers into one.
+    by_name = xcframeworks.reduce({}) do |hash, xcframework|
+      if found = hash[xcframework.name]
+        hash[found.name] = found.new_xcframework_by_adding_identifiers(xcframework.identifiers)
+      else
+        hash[xcframework.name] = xcframework
+      end
+      hash
+    end
+
+    # Turn back into a simple array
+    by_name.values
+  end
 end

data/lib/xcframework.rb

@@ -0,0 +1,29 @@
+# Example data:
+# - "name" : "GoogleSignIn",
+# - "container" : "GoogleSignIn.xcframework",
+# - "identifiers" : ["ios-arm64_i386_x86_64-simulator", "ios-arm64_armv7"]
+class XCFramework
+  attr_reader :name, :container, :identifiers
+
+  def self.parse(json)
+    XCFramework.new(json["name"], json["container"], [json["identifier"]])
+  end
+
+  def initialize(name, container, identifiers)
+    @name = name
+    @container = container
+    @identifiers = identifiers
+  end
+
+  def ==(other)
+    @name == other.name && @container == other.container && @identifiers == other.identifiers
+  end
+
+  def make_archive(platform)
+    XCFrameworkCarthageArchive.new(name, platform)
+  end
+
+  def new_xcframework_by_adding_identifiers(identifiers_to_add)
+    XCFramework.new(name, container, identifiers + identifiers_to_add)
+  end
+end

data/lib/xcframework_carthage_archive.rb

@@ -0,0 +1,17 @@
+require "fileutils"
+
+class XCFrameworkCarthageArchive < CarthageArchive
+
+  # Compresses `Carthage/Build/GoogleSignIn.xcframework``
+  # into `GoogleSignIn-iOS.zip`.`
+  def compress_archive(shell, carthage_build_dir = CARTHAGE_BUILD_DIR)
+    $LOG.debug("Archiving #{@framework_name} for #{@platform}")
+
+    framework_path = File.join(carthage_build_dir, "#{@framework_name}.xcframework")
+    raise MissingFrameworkDirectoryError.new, "Archive can't be created, no xcframework directory at #{framework_path}" unless Dir.exist?(framework_path)
+
+    delete_archive
+    shell.archive([framework_path], @archive_path)
+    $LOG.debug("Created #{@archive_path} archive, file size: #{formatted_archive_size}")
+  end
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: carthage_remote_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.11
 platform: ruby
 authors:
 - Juraj Blahunka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2022-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rerun
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +140,22 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -168,16 +174,22 @@ dependencies:
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.4
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.3.0
 description: Centralized cache to serve carthage frameworks. Useful for distributed
   CI setup with several build machines.
 email:
@@ -187,8 +199,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -214,6 +229,8 @@ files:
 - lib/constants.rb
 - lib/crc32.rb
 - lib/errors.rb
+- lib/framework.rb
+- lib/framework_carthage_archive.rb
 - lib/log.rb
 - lib/networking.rb
 - lib/server/config.ru
@@ -223,6 +240,8 @@ files:
 - lib/utils.rb
 - lib/version.rb
 - lib/version_file.rb
+- lib/xcframework.rb
+- lib/xcframework_carthage_archive.rb
 homepage: https://github.com/kayak/carthage_remote_cache
 licenses:
 - Apache-2.0
@@ -242,8 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Centralized cache to serve carthage frameworks. Useful for distributed CI