carthage_remote_cache 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 668d359528b6d3f6abf8c281b7ec00b2de532ffcab2d592dfbf7ab95cb191ccd
-  data.tar.gz: 74bf2f1193d16661a9df78b198371fc265c83d0a7c42bd4a6a885c07d7197043
+  metadata.gz: db51bc926af285ff03bc266988ab005c5f7ab4e7131aec89d12a99b1d14ea0f1
+  data.tar.gz: 6d41c8d5b3c6b08369fe595169f53ca8c8cfbc22614726227687625efae341b4
 SHA512:
-  metadata.gz: b9b56271263ff4cd50107f54d4faeab89f4ae15a17cb3468672af1a262c0c67e885ce5ddceb6c19966d27fe8545008062878f8984cf70689e5218b85a6e23d95
-  data.tar.gz: d4fcc47328b5f228d3c1b2d9eac42b4066eeefd3415c9f8415613fa38986fd79d016a30577c642e630d81bf9b43cf8f2ae2ed07eb1e11f6211a437b3dc2fe8e6
+  metadata.gz: 2fc9aa022853786a525dc61f4bbb23f1c53ff5458b05466bdf0041ac664703118391fa1cf82671c32e39012eefa1f01f664a903b35a85142e8b18ff6ae450a1f
+  data.tar.gz: ce992ab16d4281d7d348e3b04ef405de51a66fb1036282ae6a17055c7a0ab958aa1c7bb6b3e24a7adad2f04c6fc727938624e493fe31b3bdd4c2474cbd1b1540

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,20 +1,20 @@
 PATH
   remote: .
   specs:
-    carthage_remote_cache (0.0.9)
+    carthage_remote_cache (0.0.10)
       concurrent-ruby (~> 1.0.5)
-      rack (~> 2.0.6)
+      rack (>= 2.0.6, < 2.3.0)
       rest-client (~> 2.0.2)
       sinatra (~> 2.0.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.2)
+    coderay (1.1.3)
     concurrent-ruby (1.0.5)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    ffi (1.11.1)
+    ffi (1.15.0)
     formatador (0.2.5)
     guard (2.14.2)
       formatador (>= 0.2.4)
@@ -31,70 +31,70 @@ GEM
       test-unit (~> 3.0)
     http-cookie (1.0.3)
       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.13)
+    listen (3.5.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.2)
-    mime-types (3.2.2)
+    method_source (1.0.0)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2021.0225)
     mocha (1.3.0)
       metaclass (~> 0.0.1)
-    mustermann (1.0.3)
+    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.4)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rack (2.0.7)
-    rack-protection (2.0.5)
+    power_assert (2.0.0)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (2.2.3)
+    rack-protection (2.0.8.1)
       rack
-    rake (10.5.0)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rake (13.0.3)
+    rb-fsevent (0.11.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rerun (0.13.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.5.1)
+    ruby2_keywords (0.0.4)
+    rufo (0.13.0)
     shellany (0.0.1)
-    sinatra (2.0.5)
+    sinatra (2.0.8.1)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.5)
+      rack-protection (= 2.0.8.1)
       tilt (~> 2.0)
     test-unit (3.2.9)
       power_assert
-    thor (0.20.3)
-    tilt (2.0.9)
+    thor (1.1.0)
+    tilt (2.0.10)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
+    unf_ext (0.0.7.7)
 
 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.6
+   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

@@ -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.6"
+  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.4"
 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

data/lib/carthage_archive.rb

@@ -1,4 +1,4 @@
-require 'fileutils'
+require "fileutils"
 
 class CarthageArchive
   attr_reader :archive_filename, :archive_path

data/lib/carthage_remote_cache.rb

@@ -1,17 +1,17 @@
 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 "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.rb

@@ -1,8 +1,8 @@
 lib = File.expand_path("..", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require 'commands/download_command'
-require 'commands/init_command'
-require 'commands/server_command'
-require 'commands/upload_command'
-require 'commands/verify_command'
+require "commands/download_command"
+require "commands/init_command"
+require "commands/server_command"
+require "commands/upload_command"
+require "commands/verify_command"

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,7 +73,7 @@ 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|

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],

data/lib/commands/upload_command.rb

@@ -1,10 +1,10 @@
-require 'concurrent'
+require "concurrent"
 
 class UploadCommand
   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)
 
     UploadCommand.new(
@@ -62,7 +62,7 @@ class UploadCommand
   def upload(carthage_dependency)
     version_file = carthage_dependency.new_version_file
 
-    if @api.version_file_matches_server?(carthage_dependency, version_file)
+    if @api.version_file_matches_server?(carthage_dependency, version_file, nil)
       $LOG.debug("Version file #{version_file.path} matches server version, skipping upload")
       @mutex.synchronize do
         @number_of_skipped_archives += version_file.number_of_frameworks

data/lib/commands/verify_command.rb

@@ -2,7 +2,7 @@ class VerifyCommand
   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)
 
     VerifyCommand.new(api: api)

data/lib/configuration.rb

@@ -1,4 +1,4 @@
-require 'uri'
+require "uri"
 
 class Configuration
   class UserConfig

data/lib/constants.rb

@@ -1,12 +1,14 @@
-CARTHAGE_DIR = 'Carthage'
-CARTHAGE_BUILD_DIR = File.join(CARTHAGE_DIR, 'Build')
-CARTFILE_RESOLVED = 'Cartfile.resolved'
-CARTRCFILE = 'Cartrcfile'
+CARTHAGE_DIR = "Carthage"
+CARTHAGE_BUILD_DIR = File.join(CARTHAGE_DIR, "Build")
+CARTFILE_RESOLVED = "Cartfile.resolved"
+CARTRCFILE = "Cartrcfile"
 THREAD_POOL_SIZE = 8
 
 SERVER_DEFAULT_PORT = 9292
-SERVER_CACHE_DIR = File.join(Dir.home, '.carthagerc_server')
+SERVER_CACHE_DIR = File.join(Dir.home, ".carthagerc_server")
 
 ARCHIVE_CHECKSUM_HEADER_REST_CLIENT = :archive_checksum
-ARCHIVE_CHECKSUM_HEADER_SINATRA_IN = 'HTTP_ARCHIVE_CHECKSUM'
-ARCHIVE_CHECKSUM_HEADER_SINATRA_OUT = 'Archive-Checksum'
+ARCHIVE_CHECKSUM_HEADER_SINATRA_IN = "HTTP_ARCHIVE_CHECKSUM"
+ARCHIVE_CHECKSUM_HEADER_SINATRA_OUT = "Archive-Checksum"
+
+PLATFORMS = [:iOS, :macOS, :tvOS, :watchOS]

data/lib/crc32.rb

@@ -1,5 +1,5 @@
-require 'digest'
-require 'zlib'
+require "digest"
+require "zlib"
 
 class Digest::CRC32 < Digest::Class
   include Digest::Instance
@@ -17,6 +17,6 @@ class Digest::CRC32 < Digest::Class
   end
 
   def finish
-    [@crc32].pack('N')
+    [@crc32].pack("N")
   end
 end

data/lib/errors.rb

@@ -51,7 +51,7 @@ class FrameworkValidationError < AppError
   end
 
   def to_s
-    header = ['Framework', CARTHAGE_BUILD_DIR, CARTFILE_RESOLVED]
+    header = ["Framework", CARTHAGE_BUILD_DIR, CARTFILE_RESOLVED]
     rows = @errors.map { |e| [e.framework_name, e.build_version, e.cartfile_resolved_version] }
     table = Table.new(header, rows)
     <<~EOS
@@ -69,3 +69,14 @@ end
 class MissingFrameworkDirectoryError < AppError; end
 
 class ServerVersionMismatchError < AppError; end
+
+class PlatformMismatchError < AppError
+  def initialize(platform)
+    @platform = platform
+  end
+
+  def to_s
+    platforms = PLATFORMS.map(&:to_s).join(", ")
+    "Platform '#{@platform}' doesn't match any of: #{platforms}"
+  end
+end

data/lib/log.rb

@@ -1,4 +1,4 @@
-require 'logger'
+require "logger"
 
 $LOG = Logger.new(STDOUT)
 $LOG.level = Logger::INFO

data/lib/networking.rb

@@ -1,9 +1,10 @@
-require 'rest-client'
-require 'uri'
+require "rest-client"
+require "uri"
 
 class Networking
-  def initialize(config)
+  def initialize(config, is_retry_enabled)
     @config = config
+    @is_retry_enabled = is_retry_enabled
   end
 
   # Version
@@ -11,11 +12,13 @@ class Networking
   def get_server_version
     url = new_version_url
     $LOG.debug("Fetching server version from #{url}")
-    server_version = RestClient.get(url) do |response, request, result|
-      if response.code == 200
-        response.strip
-      else
-        raise AppError.new, "Failed to read server version from #{url}, response:\n  #{response[0...300]}"
+    server_version = perform_network_request do
+      RestClient.get(url) do |response, request, result|
+        if response.code == 200
+          response.strip
+        else
+          raise AppError.new, "Failed to read server version from #{url}, response:\n  #{response[0...300]}"
+        end
       end
     end
     server_version
@@ -24,15 +27,22 @@ class Networking
   # Version Files
 
   # @return VersionFile or nil
-  def download_version_file(carthage_dependency)
+  def download_version_file(carthage_dependency, platforms)
     url = new_version_file_url(carthage_dependency)
-    $LOG.debug("Downloading version file from #{url}")
-    version_file = RestClient.get(url) do |response, request, result|
-      if response.code == 200
-        File.write(carthage_dependency.version_filename, response.to_s)
-        VersionFile.new(carthage_dependency.version_filename)
-      else
-        nil
+    params = {}
+    unless platforms.nil?
+      params[:platform] = platforms.map(&:to_s).join(",")
+    end
+
+    version_file = perform_network_request do
+      $LOG.debug("Downloading version file from #{url}, params: #{params}")
+      RestClient.get(url, { params: params }) do |response, request, result|
+        if response.code == 200
+          File.write(carthage_dependency.version_filename, response.to_s)
+          VersionFile.new(carthage_dependency.version_filename)
+        else
+          nil
+        end
       end
     end
     version_file
@@ -41,10 +51,12 @@ class Networking
   # @raise AppError on upload failure
   def upload_version_file(carthage_dependency)
     url = new_version_file_url(carthage_dependency)
-    $LOG.debug("Uploading #{carthage_dependency.version_filename}")
-    RestClient.post(url, :version_file => File.new(carthage_dependency.version_filepath)) do |response, request, result|
-      unless response.code == 200
-        raise AppError.new, "Version file upload #{carthage_dependency.version_filename} failed, response:\n  #{response[0..300]}"
+    perform_network_request do
+      $LOG.debug("Uploading #{carthage_dependency.version_filename}")
+      RestClient.post(url, :version_file => File.new(carthage_dependency.version_filepath)) do |response, request, result|
+        unless response.code == 200
+          raise AppError.new, "Version file upload #{carthage_dependency.version_filename} failed, response:\n  #{response[0..300]}"
+        end
       end
     end
   end
@@ -54,14 +66,16 @@ class Networking
   # @return Hash with CarthageArchive and checksum or nil
   def download_framework_archive(carthage_dependency, framework_name, platform)
     url = new_framework_url(carthage_dependency, framework_name, platform)
-    $LOG.debug("Downloading framework from #{url}")
-    archive = RestClient.get(url) do |response, request, result|
-      if response.code == 200
-        archive = CarthageArchive.new(framework_name, platform)
-        File.write(archive.archive_path, response.to_s)
-        {:archive => archive, :checksum => response.headers[ARCHIVE_CHECKSUM_HEADER_REST_CLIENT]}
-      else
-        nil
+    archive = perform_network_request do
+      $LOG.debug("Downloading framework from #{url}")
+      RestClient.get(url) do |response, request, result|
+        if response.code == 200
+          archive = CarthageArchive.new(framework_name, platform)
+          File.write(archive.archive_path, response.to_s)
+          { :archive => archive, :checksum => response.headers[ARCHIVE_CHECKSUM_HEADER_REST_CLIENT] }
+        else
+          nil
+        end
       end
     end
     archive
@@ -70,12 +84,14 @@ class Networking
   # @raise AppError when upload fails
   def upload_framework_archive(zipfile_name, carthage_dependency, framework_name, platform, checksum)
     url = new_framework_url(carthage_dependency, framework_name, platform)
-    params = {:framework_file => File.new(zipfile_name)}
-    headers = {ARCHIVE_CHECKSUM_HEADER_REST_CLIENT => checksum}
-    $LOG.debug("Uploading framework to #{url}, headers: #{headers}")
-    RestClient.post(url, params, headers) do |response, request, result|
-      unless response.code == 200
-        raise AppError.new, "Framework upload #{zipfile_name} failed, response:\n  #{response[0..300]}"
+    params = { :framework_file => File.new(zipfile_name) }
+    headers = { ARCHIVE_CHECKSUM_HEADER_REST_CLIENT => checksum }
+    perform_network_request do
+      $LOG.debug("Uploading framework to #{url}, headers: #{headers}")
+      RestClient.post(url, params, headers) do |response, request, result|
+        unless response.code == 200
+          raise AppError.new, "Framework upload #{zipfile_name} failed, response:\n  #{response[0..300]}"
+        end
       end
     end
   end
@@ -83,12 +99,12 @@ class Networking
   private
 
   def new_version_url
-    new_server_url(['version'])
+    new_server_url(["version"])
   end
 
   def new_version_file_url(carthage_dependency)
     new_server_url([
-      'versions',
+      "versions",
       @config.xcodebuild_version,
       @config.swift_version,
       carthage_dependency.guessed_framework_basename,
@@ -99,7 +115,7 @@ class Networking
 
   def new_framework_url(carthage_dependency, framework_name, platform)
     new_server_url([
-      'frameworks',
+      "frameworks",
       @config.xcodebuild_version,
       @config.swift_version,
       carthage_dependency.guessed_framework_basename,
@@ -115,13 +131,37 @@ class Networking
       :scheme => @config.server_uri.scheme,
       :host => @config.server_uri.host,
       :port => @config.server_uri.port,
-      :path => '/' + sanitized_path_slices.join('/'),
+      :path => "/" + sanitized_path_slices.join("/"),
     )
     uri.to_s
   end
 
   # Mangle identifiers for URL paths.
   def sanitized(input)
-    input.gsub(/\//, '_')
+    input.gsub(/\//, "_")
+  end
+
+  def perform_network_request
+    if @is_retry_enabled
+      retries_remaining = 3
+      sleep_time_seconds = 5
+      begin
+        result = yield
+      rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
+             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+        if retries_remaining > 0
+          $LOG.warn("Network request failed - remaining retries: #{retries_remaining}, sleeping for: #{sleep_time_seconds}s, error: #{e.message}")
+          sleep(sleep_time_seconds)
+          retries_remaining -= 1
+          sleep_time_seconds *= 3
+          retry
+        else
+          raise e
+        end
+      end
+      result
+    else
+      yield
+    end
   end
 end

data/lib/server/config.ru

@@ -1,6 +1,6 @@
-require 'rubygems'
-require 'bundler'
+require "rubygems"
+require "bundler"
 Bundler.require
 
-require './server_app.rb'
+require "./server_app.rb"
 run Sinatra::Application

data/lib/server/server_app.rb

@@ -1,14 +1,15 @@
-require 'sinatra'
-require 'fileutils'
-require 'carthage_remote_cache'
+require "json"
+require "sinatra"
+require "fileutils"
+require "carthage_remote_cache"
 
-get '/' do
+get "/" do
   "Welcome to carthage_remote_cache"
 end
 
-version_path = '/version'
-versions_path = '/versions/:xcodebuild_version/:swift_version/:dependency_name/:version/:version_filename'
-frameworks_path = '/frameworks/:xcodebuild_version/:swift_version/:dependency_name/:version/:framework_name/:platform'
+version_path = "/version"
+versions_path = "/versions/:xcodebuild_version/:swift_version/:dependency_name/:version/:version_filename"
+frameworks_path = "/frameworks/:xcodebuild_version/:swift_version/:dependency_name/:version/:framework_name/:platform"
 
 get version_path do
   status(200)
@@ -16,13 +17,25 @@ get version_path do
 end
 
 get versions_path do
+  if params.key?(:platform)
+    begin
+      platforms = platform_to_symbols(params[:platform])
+    rescue AppError => e
+      status(400)
+      return JSON.pretty_generate({ "error" => e.message })
+    end
+  else
+    platforms = PLATFORMS
+  end
+
   dirname = params_to_framework_dir(params)
   filename = params[:version_filename]
   filepath = File.join(dirname, filename)
 
   if File.exist?(filepath)
     status(200)
-    send_file(filepath)
+    version_file = VersionFile.new(filepath, platforms)
+    JSON.pretty_generate(version_file.json)
   else
     status(404)
   end
@@ -39,7 +52,7 @@ post versions_path do
   File.delete(target_filename) if File.exist?(target_filename)
 
   $LOG.info("Writing: #{target_filename}")
-  File.open(target_filename, 'wb') do |target_file|
+  File.open(target_filename, "wb") do |target_file|
     target_file.write(source_file.read)
   end
 
@@ -75,7 +88,7 @@ post frameworks_path do
   File.delete(target_filename) if File.exist?(target_filename)
 
   $LOG.info("Writing: #{target_filename}")
-  File.open(target_filename, 'wb') do |target_file|
+  File.open(target_filename, "wb") do |target_file|
     target_file.write(source_file.read)
   end
 

data/lib/shell_wrapper.rb

@@ -1,4 +1,4 @@
-require 'open3'
+require "open3"
 
 class ShellWrapper
   # @return

data/lib/table.rb

@@ -32,8 +32,8 @@ class Table
   end
 
   def separator_line
-    dashes = @column_sizes.map { |size| '-' * size }
-    '+' + dashes.join('+') + '+'
+    dashes = @column_sizes.map { |size| "-" * size }
+    "+" + dashes.join("+") + "+"
   end
 
   def header_line
@@ -41,7 +41,7 @@ class Table
       column_size = @column_sizes[index] - 1
       " %-#{column_size}.#{column_size}s" % column
     end
-    '|' + columns.join('|') + '|'
+    "|" + columns.join("|") + "|"
   end
 
   def row_line(row)
@@ -53,6 +53,6 @@ class Table
         "%#{column_size}.#{column_size}s " % column
       end
     end
-    '|' + columns.join('|') + '|'
+    "|" + columns.join("|") + "|"
   end
 end

data/lib/utils.rb

@@ -15,7 +15,7 @@ end
 def quote(input)
   if input.is_a? String
     if input.empty?
-      ''
+      ""
     else
       '"' + input + '"'
     end
@@ -23,7 +23,7 @@ def quote(input)
     input
       .map { |e| quote(e) }
       .select { |e| !e.empty? }
-      .join(' ')
+      .join(" ")
   else
     raise AppError.new, "Unsupported type #{input}"
   end
@@ -32,13 +32,13 @@ end
 def platform_to_api_string(platform)
   case platform
   when :iOS
-    'iOS'
+    "iOS"
   when :macOS
-    'macOS'
+    "macOS"
   when :tvOS
-    'tvOS'
+    "tvOS"
   when :watchOS
-    'watchOS'
+    "watchOS"
   else
     raise AppError.new, "Unrecognized platform #{platform.inspect}"
   end
@@ -47,18 +47,28 @@ end
 def platform_to_carthage_dir_string(platform)
   case platform
   when :iOS
-    'iOS'
+    "iOS"
   when :macOS
-    'Mac'
+    "Mac"
   when :tvOS
-    'tvOS'
+    "tvOS"
   when :watchOS
-    'watchOS'
+    "watchOS"
   else
     raise AppError.new, "Unrecognized platform #{platform.inspect}"
   end
 end
 
+def platform_to_symbols(string)
+  platforms = string.split(",").map(&:to_sym)
+  for platform in platforms
+    if !PLATFORMS.include?(platform)
+      raise PlatformMismatchError.new(platform)
+    end
+  end
+  platforms
+end
+
 # @return string in "x.y MB" format
 def format_file_size(bytes)
   megabytes = bytes / 1000.0 / 1000.0

data/lib/version.rb

@@ -1 +1 @@
-VERSION = '0.0.9'
+VERSION = "0.0.10"

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
 
@@ -55,7 +56,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,23 +65,36 @@ 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)
+  def parse_platform(platform)
+    carthage_platform_name = platform_to_carthage_dir_string(platform)
+    array = @json[carthage_platform_name]
     if array.kind_of?(Array)
-      array.map { |entry| entry['name'] }
+      array.map { |entry| entry["name"] }
     else
       []
     end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: carthage_remote_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Juraj Blahunka
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2021-05-20 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.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.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +195,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -227,7 +234,7 @@ homepage: https://github.com/kayak/carthage_remote_cache
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -242,9 +249,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubygems_version: 3.2.4
+signing_key:
 specification_version: 4
 summary: Centralized cache to serve carthage frameworks. Useful for distributed CI
   setup with several build machines.