carthage_remote_cache 0.0.8 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b0378eb00151bc4e33a1ffc537c7cbb6bca23d24
-  data.tar.gz: 3c8e29aea0bb379b562053fdcf5fb5a707451bae
+SHA256:
+  metadata.gz: 3437fb2e13b47b5d1a5479e5d028b0e96447cc232bfa3a9b08e38e014a24bf2a
+  data.tar.gz: a84e8493195b8d80622ac63ec76eac05754f5917d12e634c432dcee1a5ff5558
 SHA512:
-  metadata.gz: ea26a9202429da4c8a49b1a9080db44b60fb3f27baaa45c71821ef674cac4fbc5caea59a5ae19c728abbd256d26aa69a04de49e0a088708d90e5f58f3d2fffc3
-  data.tar.gz: 42e74e05ac76e0836be06e92ade5d3aa91935a5315c877e2ba541ba3f1b1a7404d42a6aa9d1161a9d74aa034b4488e0f9561394800201a468694d29790aa01c3
+  metadata.gz: 5dae27cbc7028ba7ea772cabf04ff1dd750b2950e3c7e30a11e06c86ed202cfcd8b800263a2214d0475d80572007af5553c79844661d4f537fe6413004e9eed2
+  data.tar.gz: f04784fcf41b486a53d1706c0371ea10d3b27fe575ca9687204f9c000713fd58d199eaede9d7ca770ef7681432479b57346bf832d1b482cbb90b3dfe63815faf

data/.github/workflows/ruby.yml

@@ -0,0 +1,38 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.7.2']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@2b019609e2b0f1ea1a2bc8ca11cb82ab46ada124
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake test

data/.ruby-version

@@ -0,0 +1,2 @@
+2.7.2
+

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
- - 2.5.0
+ - 2.7.2
 script:
  - bundle exec rake test

data/Dockerfile

@@ -0,0 +1,7 @@
+FROM ruby:2.7.1-alpine3.12
+
+RUN apk add --no-cache g++ make
+RUN gem install carthage_remote_cache
+
+EXPOSE 9292
+CMD ["carthagerc", "server"]

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    carthage_remote_cache (0.0.8)
+    carthage_remote_cache (0.0.11)
       concurrent-ruby (~> 1.0.5)
-      rack (~> 2.0.4)
+      rack (>= 2.0.6, < 2.3.0)
       rest-client (~> 2.0.2)
-      sinatra (~> 2.0.1)
+      sinatra (>= 2.0.4, < 2.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.2)
+    coderay (1.1.3)
     concurrent-ruby (1.0.5)
-    domain_name (0.5.20180417)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    ffi (1.9.21)
-    formatador (0.2.5)
+    ffi (1.15.5)
+    formatador (1.1.0)
     guard (2.14.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -29,72 +29,72 @@ GEM
     guard-test (2.0.8)
       guard-compat (~> 1.2)
       test-unit (~> 3.0)
-    http-cookie (1.0.3)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.12)
+    listen (3.7.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
     metaclass (0.0.4)
-    method_source (0.9.0)
-    mime-types (3.1)
+    method_source (1.0.0)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2022.0105)
     mocha (1.3.0)
       metaclass (~> 0.0.1)
-    mustermann (1.0.2)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
     nenv (0.3.0)
     netrc (0.11.0)
-    notiffany (0.1.1)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    power_assert (1.1.1)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rack (2.0.5)
-    rack-protection (2.0.1)
+    power_assert (2.0.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (2.2.4)
+    rack-protection (2.2.0)
       rack
-    rake (10.5.0)
-    rb-fsevent (0.10.2)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rerun (0.13.0)
+    rake (13.0.6)
+    rb-fsevent (0.11.1)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rerun (0.13.1)
       listen (~> 3.0)
     rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    ruby_dep (1.5.0)
-    rufo (0.2.0)
+    ruby2_keywords (0.0.5)
+    rufo (0.13.0)
     shellany (0.0.1)
-    sinatra (2.0.1)
+    sinatra (2.2.0)
       mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.1)
+      rack (~> 2.2)
+      rack-protection (= 2.2.0)
       tilt (~> 2.0)
-    test-unit (3.2.7)
+    test-unit (3.2.9)
       power_assert
-    thor (0.20.0)
-    tilt (2.0.8)
+    thor (1.2.1)
+    tilt (2.0.10)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.8.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler
   carthage_remote_cache!
   guard (~> 2.14.2)
   guard-test (~> 2.0.8)
   mocha (~> 1.3.0)
-  rake (~> 10.0)
+  rake (~> 13.0)
   rerun
   rufo
   test-unit (~> 3.2.7)
 
 BUNDLED WITH
-   1.16.1
+   2.2.11

data/Guardfile

@@ -1,6 +1,6 @@
 guard :test do
   watch(%r{^test/.+_tests\.rb$})
-  watch('test/test_helper.rb') { 'test' }
-  watch('test/fixtures.rb') { 'test' }
+  watch("test/test_helper.rb") { "test" }
+  watch("test/fixtures.rb") { "test" }
   watch(%r{^lib/(.+)\.rb$}) { |m| "test/#{m[1]}_tests.rb" }
 end

data/README.md

@@ -1,6 +1,6 @@
 # CarthageRemoteCache
 
-[![Build Status](https://travis-ci.org/kayak/carthage_remote_cache.svg?branch=master)](https://travis-ci.org/kayak/carthage_remote_cache)
+[![Test Status](https://github.com/kayak/carthage_remote_cache/actions/workflows/ruby.yml/badge.svg)](https://github.com/kayak/carthage_remote_cache/actions/workflows/ruby.yml)
 [![Gem Version](https://badge.fury.io/rb/carthage_remote_cache.svg)](https://badge.fury.io/rb/carthage_remote_cache)
 
 Centralized cache to serve Carthage frameworks. Useful for distributed CI setup with several build machines. It's aware of your `xcodebuild` and `swift` versions and builds on top of Carthage's `.xyz.version` file mechanism.
@@ -68,22 +68,29 @@ It is recommended to always perform the upload workflow after upgrading Xcode an
 
 ### Download Workflow
 
-Once cache server has been populated with framework binaries, it's time to fetch frameworks from a different machine. Make sure to pull in `Cartrcfile` from respository before executing:
+Once the cache server has been populated with framework binaries, it's time to fetch frameworks from a different machine. Make sure to pull in `Cartrcfile` from the repository before executing:
 
     $ carthagerc download
 
-You should expect to see following output on a machine with empty `Carthage` folder:
+You should expect to see the following output on a machine with empty `Carthage` folder:
 
     Downloaded and extracted 53 archives (97.2 MB), skipped 0 archives.
 
 Your project should be ready for building.
 
-#### Overwriting Local Carthage Folder
+#### Overwrite Local Carthage Folder
 
 In case you happen to change a file in `Carthage/Build` by accident, it's possible to force download all frameworks again with:
 
     $ carthagerc download --force
 
+#### Download Only Some Platforms
+
+The example above downloaded all frameworks for all platforms (iOS, macOS, tvOS, watchOS). If large dependencies or network speed are an issue, you can download only a subset of the platforms by using the `--platform` argument:
+
+    $ carthagerc download --platform iOS,macOS,tvOS,watchOS
+
+Please note, that invoking the `download` command multiple times with different platform arguments is not supported. The `.version` file will "forget" that `carthagerc` already downloaded the platform specified before the last download. If you need multiple platforms, specify them in a single `download` command once, delimited with a comma.
 
 ### Config
 
@@ -205,6 +212,30 @@ If you want to stop the agent, run:
 
 Check out official documentation on [Launch Agents](https://developer.apple.com/library/content/documentation/MacOSX/Conceptual/BPSystemStartup/Chapters/CreatingLaunchdJobs.html) for more info.
 
+#### Docker
+
+To build an image based on the latest released gem, run
+
+    $ docker build -t carthagerc .
+
+Afterwards you can run the image in a container using
+
+    $ docker run -d --publish 9292:9292 --name carthagerc carthagerc:latest
+
+The server will now be available on port 9292 on `localhost`. Note that the command above will cause any data added to `~/.carthagerc_server` to be written into the container layer. While this works, it's generally discouraged due to decreased performance and portability. To avoid this, you can use a volume.
+
+    $ docker run -d --publish 9292:9292 --mount "source=carthagerc,target=/root/.carthagerc_server" --name carthagerc carthagerc:latest
+
+We also recommend adding the `--log-opt` option to limit the size of logs, e.g. `--log-opt max-size=50m`.
+
+To inspect the logs after running, use
+
+    $ docker logs carthagerc
+
+To stop the container, run
+
+    $ docker container stop carthagerc
+
 ### Version
 
     $ carthagerc version
@@ -221,7 +252,7 @@ Documentation is also available when running `carthagerc` or `carthagerc --help`
         config
             print environment information and Cartrcfile configuration
 
-        download [-f|--force] [-v|--verbose]
+        download [-f|--force] [-v|--verbose] [-mPLATFORM|--platform=PLATFORM]
             fetch missing frameworks into Carthage/Build
 
         init
@@ -242,6 +273,8 @@ Documentation is also available when running `carthagerc` or `carthagerc --help`
     OPTIONS
         -f, --force                      Force upload/download of framework archives even if local and server .version files match
         -h, --help                       Show help
+        -m, --platform=PLATFORM          Comma delimited list of platforms which should be downloaded from the server; e.g. `--platform iOS,macOS`; Supported values: iOS, macOS, tvOS, watchOS
+        -n, --no-retry                   Don't retry download or upload on network failures
         -p, --port=PORT                  Server application port used when starting server, default port is 9292
         -v, --verbose                    Show extra runtime information
 

data/Rakefile

@@ -5,10 +5,10 @@ task :default => :spec
 
 Rake::TestTask.new do |t|
   t.libs << "test"
-  t.test_files = FileList['test/*_tests.rb']
+  t.test_files = FileList["test/*_tests.rb"]
   t.verbose = true
 end
 
 task :format do
-  system('rufo bin/carthagerc lib test Gemfile Guardfile Rakefile carthage_remote_cache.gemspec')
+  system("bundle exec rufo bin/carthagerc lib test Gemfile Guardfile Rakefile carthage_remote_cache.gemspec")
 end

data/bin/carthagerc

@@ -2,13 +2,15 @@
 
 $LOAD_PATH.push File.expand_path("../../lib", __FILE__)
 
-require 'optparse'
-require 'carthage_remote_cache'
-require 'commands'
+require "optparse"
+require "carthage_remote_cache"
+require "commands"
 
-ARGV << '-h' if ARGV.empty?
+ARGV << "-h" if ARGV.empty?
+command = ARGV[0]
 options = {
   :force => false,
+  :is_retry_enabled => true,
   :server_port => SERVER_DEFAULT_PORT,
   :verbose => false,
 }
@@ -30,7 +32,7 @@ opt_parser = OptionParser.new do |opt|
   opt.separator "    config"
   opt.separator "        print environment information and #{CARTRCFILE} configuration"
   opt.separator ""
-  opt.separator "    download [-f|--force] [-v|--verbose]"
+  opt.separator "    download [-f|--force] [-v|--verbose] [-mPLATFORM|--platform=PLATFORM]"
   opt.separator "        fetch missing frameworks into Carthage/Build"
   opt.separator ""
   opt.separator "    init"
@@ -59,6 +61,15 @@ opt_parser = OptionParser.new do |opt|
     exit
   end
 
+  opt.on("-m", "--platform=PLATFORM", "Comma delimited list of platforms which should be downloaded from the server; e.g. `--platform iOS,macOS`; Supported values: #{PLATFORMS.map(&:to_s).join(", ")}") do |platform|
+    raise AppError.new("[-p|--platform] is only supported for the 'download' command") if command != "download"
+    options[:platforms] = platform_to_symbols(platform)
+  end
+
+  opt.on("-n", "--no-retry", "Don't retry download or upload on network failures") do
+    options[:is_retry_enabled] = false
+  end
+
   opt.on("-pPORT", "--port=PORT", "Server application port used when starting server, default port is #{SERVER_DEFAULT_PORT}") do |port|
     options[:server_port] = port
   end
@@ -68,10 +79,9 @@ opt_parser = OptionParser.new do |opt|
   end
 end
 
-opt_parser.parse!
-
 begin
-  command = ARGV[0]
+  opt_parser.parse!
+
   case command
   when "config"
     puts Configuration.new_with_defaults

data/carthage_remote_cache.gemspec

@@ -20,17 +20,17 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "guard", "~> 2.14.2"
   spec.add_development_dependency "guard-test", "~> 2.0.8"
   spec.add_development_dependency "mocha", "~> 1.3.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rerun"
   spec.add_development_dependency "rufo"
   spec.add_development_dependency "test-unit", "~> 3.2.7"
 
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0.5"
-  spec.add_runtime_dependency "rack", "~> 2.0.4"
+  spec.add_runtime_dependency "rack", ">= 2.0.6", "< 2.3.0"
   spec.add_runtime_dependency "rest-client", "~> 2.0.2"
-  spec.add_runtime_dependency "sinatra", "~> 2.0.1"
+  spec.add_runtime_dependency "sinatra", ">= 2.0.4", "< 2.3.0"
 end

data/dev/start_server

@@ -3,6 +3,6 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 pushd "$DIR/../lib/server"
 
-rerun --no-notify rackup
+bundle exec rerun --no-notify rackup
 
 popd

data/lib/api.rb

@@ -23,7 +23,7 @@ class API
       rescue VersionFileDoesNotExistError => e
         errors << OutdatedFrameworkBuildError.new(
           carthage_dependency.guessed_framework_basename,
-          '-',
+          "-",
           carthage_dependency.version
         )
       rescue OutdatedFrameworkBuildError => e
@@ -35,11 +35,11 @@ class API
     end
   end
 
-  def version_file_matches_server?(carthage_dependency, version_file)
+  def version_file_matches_server?(carthage_dependency, version_file, platforms)
     if @options[:force]
       false
     else
-      server_version_file = @networking.download_version_file(carthage_dependency)
+      server_version_file = @networking.download_version_file(carthage_dependency, platforms)
       result = version_file.same_content?(server_version_file)
       server_version_file.remove unless server_version_file.nil?
       result
@@ -47,13 +47,13 @@ class API
   end
 
   # @return zip archive size in Bytes
-  def create_and_upload_archive(carthage_dependency, framework_name, platform)
-    archive = CarthageArchive.new(framework_name, platform)
-    archive.create_archive(@shell)
+  def create_and_upload_archive(carthage_dependency, framework, platform)
+    archive = framework.make_archive(platform)
+    archive.compress_archive(@shell)
     archive_size = archive.archive_size
     begin
       checksum = crc32(archive.archive_path)
-      @networking.upload_framework_archive(archive.archive_path, carthage_dependency, framework_name, platform, checksum)
+      @networking.upload_framework_archive(archive.archive_path, carthage_dependency, framework.name, platform, checksum)
     ensure
       archive.delete_archive
     end
@@ -62,10 +62,10 @@ class API
 
   # @return zip archive size in Bytes
   # @raise AppError if download or checksum validation fails
-  def download_and_unpack_archive(carthage_dependency, framework_name, platform)
-    result = @networking.download_framework_archive(carthage_dependency, framework_name, platform)
+  def download_and_unpack_archive(carthage_dependency, framework, platform)
+    result = @networking.download_framework_archive(carthage_dependency, framework, platform)
     if result.nil?
-      raise AppError.new, "Failed to download framework #{carthage_dependency} – #{framework_name} (#{platform}). Please `upload` the framework first."
+      raise AppError.new, "Failed to download framework #{carthage_dependency} – #{framework.name} (#{platform}). Please `upload` the framework first."
     end
 
     archive = result[:archive]

data/lib/carthage_archive.rb

@@ -1,3 +1,5 @@
+require "fileutils"
+
 class CarthageArchive
   attr_reader :archive_filename, :archive_path
 
@@ -10,44 +12,11 @@ class CarthageArchive
     @archive_path = @archive_filename
   end
 
-  # Aggregate following files:
-  # - Carthage/Build/iOS/Alamofire.framework
-  # - Carthage/Build/iOS/Alamofire.framework/Alamofire
-  # - Carthage/Build/iOS/618BEB79-4C7F-3692-B140-131FB983AC5E.bcsymbolmap
-  # into Alamofire-iOS.zip
-  def create_archive(shell, carthage_build_dir = CARTHAGE_BUILD_DIR)
-    $LOG.debug("Archiving #{@framework_name} for #{@platform}")
-
-    platform_path = File.join(carthage_build_dir, platform_to_carthage_dir_string(@platform))
-    framework_path = File.join(platform_path, "#{@framework_name}.framework")
-    raise MissingFrameworkDirectoryError.new, "Archive can't be created, no framework directory at #{framework_path}" unless Dir.exist?(framework_path)
-
-    # It's very likely, that binary releases don't contain DSYMs.
-    dsym_path = File.join(platform_path, "#{@framework_name}.framework.dSYM")
-    unless File.exist?(dsym_path)
-      $LOG.error("DSYM File #{dsym_path} not found, continuing")
-      dsym_path = nil
-    end
-
-    binary_path = File.join(framework_path, @framework_name)
-    raise AppError.new, "Binary #{binary_path} is missing, failed to read .bcsymbolmap files" unless File.exist?(binary_path)
-
-    bcsymbolmap_paths = find_bcsymbolmap_paths(shell, platform_path, binary_path)
-
-    input_paths = []
-    input_paths << framework_path
-    input_paths << dsym_path unless dsym_path.nil?
-    input_paths += bcsymbolmap_paths
-
-    $LOG.debug("Adding > #{input_paths.inspect}")
+  def unpack_archive(shell, carthage_build_dir = CARTHAGE_BUILD_DIR)
+    raise AppError.new, "Archive #{@archive_path} is missing" unless File.exist?(@archive_path)
 
-    delete_archive
-    shell.archive(input_paths, @archive_path)
-    $LOG.debug("Created #{@archive_path} archive, file size: #{formatted_archive_size}")
-  end
+    delete_existing_build_framework_if_exists(carthage_build_dir)
 
-  def unpack_archive(shell)
-    raise AppError.new, "Archive #{@archive_path} is missing" unless File.exist?(@archive_path)
     $LOG.debug("Unpacking #{@archive_path}, file size: #{formatted_archive_size}")
     shell.unpack(@archive_path)
   end
@@ -63,22 +32,15 @@ class CarthageArchive
 
   private
 
-  def find_bcsymbolmap_paths(shell, platform_path, binary_path)
-    raw_dwarfdump = shell.dwarfdump(binary_path)
-    uuids = parse_uuids(raw_dwarfdump)
-    bcsymbolmap_paths = uuids.map { |uuid| File.join(platform_path, "#{uuid}.bcsymbolmap") }.select { |path| File.exist?(path) }
-    bcsymbolmap_paths
-  end
-
-  # Example dwarfdump link:
-  # UUID: 618BEB79-4C7F-3692-B140-131FB983AC5E (i386) Carthage/Build/iOS/CocoaLumberjackSwift.framework/CocoaLumberjackSwift
-  def parse_uuids(raw_dwarfdump)
-    lines = raw_dwarfdump.split("\n")
-    uuids = lines.map { |line| line[/^UUID: ([A-Z0-9\-]+)\s+\(.*$/, 1] }
-    uuids.compact
-  end
-
   def formatted_archive_size
     format_file_size(archive_size)
   end
+
+  def delete_existing_build_framework_if_exists(carthage_build_dir)
+    framework_path = File.join(carthage_build_dir, "#{@framework_name}.xcframework")
+    if File.exist?(framework_path)
+      $LOG.debug("Deleting #{framework_path}")
+      FileUtils.rm_rf(framework_path)
+    end
+  end
 end

data/lib/carthage_remote_cache.rb

@@ -1,17 +1,21 @@
 lib = File.expand_path("..", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require 'api'
-require 'carthage_archive'
-require 'carthage_dependency'
-require 'constants'
-require 'configuration'
-require 'crc32'
-require 'errors'
-require 'log'
-require 'networking'
-require 'shell_wrapper'
-require 'table'
-require 'utils'
-require 'version'
-require 'version_file'
+require "api"
+require "carthage_archive"
+require "framework_carthage_archive"
+require "xcframework_carthage_archive"
+require "framework"
+require "xcframework"
+require "carthage_dependency"
+require "constants"
+require "configuration"
+require "crc32"
+require "errors"
+require "log"
+require "networking"
+require "shell_wrapper"
+require "table"
+require "utils"
+require "version"
+require "version_file"

data/lib/commands/download_command.rb

@@ -1,16 +1,17 @@
-require 'concurrent'
+require "concurrent"
 
 class DownloadCommand
   def self.new_with_defaults(options)
     shell = ShellWrapper.new
     config = Configuration.new(shell)
-    networking = Networking.new(config)
+    networking = Networking.new(config, options[:is_retry_enabled])
     api = API.new(shell, config, networking, options)
 
     DownloadCommand.new(
       config: config,
       networking: networking,
       api: api,
+      platforms: options[:platforms],
     )
   end
 
@@ -18,6 +19,7 @@ class DownloadCommand
     @config = args[:config]
     @networking = args[:networking]
     @api = args[:api]
+    @platforms = args[:platforms]
   end
 
   def run
@@ -57,14 +59,13 @@ class DownloadCommand
   private
 
   def download(carthage_dependency)
-    local_version_file =
-      if File.exist?(carthage_dependency.version_filepath)
+    local_version_file = if File.exist?(carthage_dependency.version_filepath)
         carthage_dependency.new_version_file
       else
         nil
       end
 
-    if !local_version_file.nil? && @api.version_file_matches_server?(carthage_dependency, local_version_file)
+    if !local_version_file.nil? && @api.version_file_matches_server?(carthage_dependency, local_version_file, @platforms)
       $LOG.debug("Version file #{local_version_file.path} matches server version, skipping download")
       @mutex.synchronize do
         @number_of_skipped_archives += local_version_file.number_of_frameworks
@@ -72,12 +73,12 @@ class DownloadCommand
       return
     end
 
-    version_file = @networking.download_version_file(carthage_dependency)
+    version_file = @networking.download_version_file(carthage_dependency, @platforms)
     raise AppError.new, "Version file #{carthage_dependency.version_filename} is not present on the server, please run `carthagerc upload` first" if version_file.nil?
 
-    version_file.frameworks_by_platform.each do |platform, framework_names|
-      for framework_name in framework_names
-        archive_size = @api.download_and_unpack_archive(carthage_dependency, framework_name, platform)
+    version_file.frameworks_by_platform.each do |platform, frameworks|
+      for framework in frameworks
+        archive_size = @api.download_and_unpack_archive(carthage_dependency, framework, platform)
         @mutex.synchronize do
           @number_of_downloaded_archives += 1
           @total_archive_size += archive_size

data/lib/commands/server_command.rb

@@ -4,8 +4,8 @@ class ServerCommand
   end
 
   def run
-    ENV['RACK_ENV'] = 'production'
-    require 'server/server_app'
+    ENV["RACK_ENV"] = "production"
+    require "server/server_app"
     Rack::Handler::WEBrick.run(
       Sinatra::Application,
       :Port => @options[:server_port],