carthage_remote_cache 0.0.5 → 0.0.10

data/lib/version.rb

@@ -1 +1 @@
-VERSION = '0.0.5'
+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,32 +56,45 @@ class VersionFile
     if other_version_file.nil?
       false
     else
-      FileUtils.compare_file(@path, other_version_file.path)
+      @json == other_version_file.json
     end
   end
 
   private
 
   def parse
-    raise AppError.new, "File #{path} doesn't exist, has carthage been bootstrapped?" unless File.exist?(@path)
+    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.5
+  version: 0.0.10
 platform: ruby
 authors:
 - Juraj Blahunka
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-09 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.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
@@ -170,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.4
 description: Centralized cache to serve carthage frameworks. Useful for distributed
   CI setup with several build machines.
 email:
@@ -189,6 +195,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -197,7 +204,6 @@ files:
 - Rakefile
 - bin/carthagerc
 - carthage_remote_cache.gemspec
-- com.kayak.carthagerc.server.plist
 - dev/console
 - dev/setup
 - dev/start_server
@@ -210,6 +216,7 @@ files:
 - lib/commands/init_command.rb
 - lib/commands/server_command.rb
 - lib/commands/upload_command.rb
+- lib/commands/verify_command.rb
 - lib/configuration.rb
 - lib/constants.rb
 - lib/crc32.rb
@@ -219,6 +226,7 @@ files:
 - lib/server/config.ru
 - lib/server/server_app.rb
 - lib/shell_wrapper.rb
+- lib/table.rb
 - lib/utils.rb
 - lib/version.rb
 - lib/version_file.rb
@@ -226,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
@@ -241,9 +249,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
-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.

data/com.kayak.carthagerc.server.plist

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>Label</key>
-        <string>com.kayak.carthagerc.server</string>
-        <key>ProgramArguments</key>
-        <array>
-            <string>/usr/local/bin/carthagerc</string>
-            <string>server</string>
-            <string>--port=9292</string>
-        </array>
-        <key>KeepAlive</key>
-        <true/>
-        <key>StandardOutPath</key>
-        <string>/Users/MY_USER/Library/Logs/carthagerc.server.stdout.log</string>
-        <key>StandardErrorPath</key>
-        <string>/Users/MY_USER/Library/Logs/carthagerc.server.stderr.log</string>
-    </dict>
-</plist>