carthage_remote_cache 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 76eb34fe905eb5fce02802b6b3d7a764b144cc4ab20b6f67d2068215c6605811
-  data.tar.gz: ce2786ceae18cdc95d4c21360044b21838f839879d5a69f883d7b8c8d2040f15
+SHA1:
+  metadata.gz: c9bbfa634ee9bb3c1bfadcd969e0cee161b05b31
+  data.tar.gz: 41a3a1a435a0db2570ca4165cc2056c44ecdaf44
 SHA512:
-  metadata.gz: a128b2d782cee56f2ddfc018a8f4e4e3275dd87b1337d6420861ee376edd0ea468655739951667768855721d0f91a7176a4102a4f20a2cc92e363e617bebe2d8
-  data.tar.gz: ffead6c5c29416ed7d12e2fdbd26f465127deedb80fb3af261904de35b2a22245a9302427081ff5e86585e2426db4a4444bbac57680e0726b7b3d2d9809f2e8d
+  metadata.gz: d192c10e5ac5e87bd66deadb3808b688e7f471e7fbb9d30761edbe439c5ad29418e001edcc051d80e83935862cd625ba08edaee3c8deb3c5708eca1090be0b90
+  data.tar.gz: f714d62a8a03134efa062bc061adeb121f8c9f4960ec22ca8b77b8d6a79e0c96332d5ada2dcb4864856007dffd24fb3d20177d1508211eb1ac3e407c52d5acff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    carthage_remote_cache (0.0.5)
+    carthage_remote_cache (0.0.6)
       concurrent-ruby (~> 1.0.5)
       rack (~> 2.0.4)
       rest-client (~> 2.0.2)

data/README.md

@@ -122,6 +122,19 @@ Server is bound to port 9292 by default. If you need to use different port, spec
 
 Don't forget to change port number in your version controlled `Cartrcfile`.
 
+#### Version Compatibility
+
+Before each `carthagerc [upload|download]`, the script compares its version number against cache server. If the version doesn't match, `carthagerc` aborts with:
+
+    Version mismatch:
+      Cache server version: 0.0.7
+      Client version:       0.0.6
+
+    Please use the same version as cache server is using by running:
+    $ gem install carthage_remote_cache -v 0.0.7
+
+Please note, that this functionality only works with clients starting with version [0.0.6](https://github.com/kayak/carthage_remote_cache/releases/tag/0.0.6).
+
 #### Directory Structure
 
 Cache server stores version files and framework archives in following directory structure:

data/lib/api.rb

@@ -5,6 +5,13 @@ class API
     @options = options
   end
 
+  def verify_server_version
+    server_version = @networking.get_server_version
+    unless server_version == VERSION
+      raise VersionMismatchError.new, version_mismatch_message(server_version)
+    end
+  end
+
   def version_file_matches_server?(carthage_dependency, version_file)
     if @options[:force]
       false
@@ -58,6 +65,17 @@ class API
 
   private
 
+  def version_mismatch_message(server_version)
+    <<~EOS
+      Version mismatch:
+        Cache server version: #{server_version}
+        Client version:       #{VERSION}
+
+      Please use the same version as cache server by running:
+      $ gem install carthage_remote_cache -v #{server_version}
+    EOS
+  end
+
   def checksum_error_message(path, remote, local)
     <<~EOS
       Checksums for '#{path}' do not match:

data/lib/commands/download_command.rb

@@ -21,8 +21,11 @@ class DownloadCommand
   end
 
   def run
+    @api.verify_server_version
+
     pool = Concurrent::FixedThreadPool.new(THREAD_POOL_SIZE)
 
+    @mutex = Mutex.new
     @number_of_downloaded_archives = 0
     @number_of_skipped_archives = 0
     @total_archive_size = 0
@@ -62,7 +65,9 @@ class DownloadCommand
 
     if !local_version_file.nil? && @api.version_file_matches_server?(carthage_dependency, local_version_file)
       $LOG.debug("Version file #{local_version_file.path} matches server version, skipping download")
-      @number_of_skipped_archives += local_version_file.number_of_frameworks
+      @mutex.synchronize do
+        @number_of_skipped_archives += local_version_file.number_of_frameworks
+      end
       return
     end
 
@@ -72,8 +77,10 @@ class DownloadCommand
     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)
-        @number_of_downloaded_archives += 1
-        @total_archive_size += archive_size
+        @mutex.synchronize do
+          @number_of_downloaded_archives += 1
+          @total_archive_size += archive_size
+        end
       end
     end
     version_file.move_to_build_dir

data/lib/commands/upload_command.rb

@@ -21,10 +21,13 @@ class UploadCommand
   end
 
   def run
+    @api.verify_server_version
+
     pool = Concurrent::FixedThreadPool.new(THREAD_POOL_SIZE)
 
     $LOG.debug("Will upload frameworks: #{@config.all_framework_names}")
 
+    @mutex = Mutex.new
     @number_of_uploaded_archives = 0
     @number_of_skipped_archives = 0
     @total_archive_size = 0
@@ -61,7 +64,9 @@ class UploadCommand
 
     if @api.version_file_matches_server?(carthage_dependency, version_file)
       $LOG.debug("Version file #{version_file.path} matches server version, skipping upload")
-      @number_of_skipped_archives += version_file.number_of_frameworks
+      @mutex.synchronize do
+        @number_of_skipped_archives += version_file.number_of_frameworks
+      end
       return
     end
 
@@ -70,8 +75,10 @@ class UploadCommand
     version_file.frameworks_by_platform.each do |platform, framework_names|
       for framework_name in framework_names
         archive_size = @api.create_and_upload_archive(carthage_dependency, framework_name, platform)
-        @number_of_uploaded_archives += 1
-        @total_archive_size += archive_size
+        @mutex.synchronize do
+          @number_of_uploaded_archives += 1
+          @total_archive_size += archive_size
+        end
       end
     end
   end

data/lib/errors.rb

@@ -22,3 +22,5 @@ end
 class OutdatedFrameworkBuildError < AppError; end
 
 class MissingFrameworkDirectoryError < AppError; end
+
+class VersionMismatchError < AppError; end

data/lib/networking.rb

@@ -6,6 +6,21 @@ class Networking
     @config = config
   end
 
+  # Version
+
+  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]}"
+      end
+    end
+    server_version
+  end
+
   # Version Files
 
   # @return VersionFile or nil
@@ -67,6 +82,10 @@ class Networking
 
   private
 
+  def new_version_url
+    new_server_url(['version'])
+  end
+
   def new_version_file_url(carthage_dependency)
     new_server_url([
       'versions',

data/lib/server/server_app.rb

@@ -6,9 +6,15 @@ 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'
 
+get version_path do
+  status(200)
+  VERSION
+end
+
 get versions_path do
   dirname = params_to_framework_dir(params)
   filename = params[:version_filename]

data/lib/version.rb

@@ -1 +1 @@
-VERSION = '0.0.5'
+VERSION = '0.0.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carthage_remote_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Juraj Blahunka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -242,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Centralized cache to serve carthage frameworks. Useful for distributed CI