carthage_cache 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d9073ae5c1c8c1606fae0af3e8fcbd4cc970174
-  data.tar.gz: a5b435d18b552a2f57e12ac5af3f644de3358340
+  metadata.gz: 14c557ec9aff88645661930d8726c26353cf9eb1
+  data.tar.gz: d4f6a67baf8b14d2e20ba7cfeca16fbf413dc22d
 SHA512:
-  metadata.gz: 509ab485f2f00b67e736426445b0959627bea03ec853047f4c7db4907fa78c33189f1582569edae94ca162dd6922180e2f715fd0584d394edc8034c93923bd32
-  data.tar.gz: b236a7d83332526ca67f4b8448f0db7840186bbcf3102ebe76b4cef1b6cf46beea878cb6c7b2c56721583552ee6bfa63570c349e2ad7ecf11b59010b50ec28c6
+  metadata.gz: f8cb4a55c9a8887c655e1103a51ee3ec6db841137aab8ba97327608e9b286dafe71b4186bececa928f0a22658c298bb69c632ca0e6313bc1a64521d27f6cb390
+  data.tar.gz: aa0922188cc9ec64a75194f6b7ea7fa9152d3ff947099f32d497be7f4eface163481b39c91f3b18072e968d7b36ae552c29283b3039cc0e7bfdf6e18c2267508

data/exe/carthage_cache

@@ -1,6 +1,12 @@
 #!/usr/bin/env ruby
 
-#require "bundler/setup"
+if Gem::Specification::find_all_by_name('bundler').any?
+  require 'bundler/setup'
+else
+  require 'rubygems'
+  gem 'carthage_cache'
+end
+
 require "commander/import"
 require "carthage_cache"
 
@@ -90,3 +96,12 @@ command :prune do |c|
     app.prune_build_directory(options.prune_white_list)
   end
 end
+
+command :validate do |c|
+  c.syntax = "#{PROGRAM_NAME} validate [PROJECT_PATH]"
+  c.description = 'Validates the cache archive for the current Cartfile.resolved.'
+  c.action do |args, options|
+    app = CarthageCache::Application.new(args.first || ".", verbose, config)
+    exit 1 unless app.validate_installation
+  end
+end

data/lib/carthage_cache.rb

@@ -11,10 +11,11 @@ require "carthage_cache/configuration_validator"
 require "carthage_cache/configuration"
 require "carthage_cache/configurator"
 require "carthage_cache/configurator_wizard"
-require "carthage_cache/shell_command_executor.rb"
-require "carthage_cache/application.rb"
-require "carthage_cache/swift_version_resolver.rb"
-require "carthage_cache/build_collector.rb"
+require "carthage_cache/shell_command_executor"
+require "carthage_cache/application"
+require "carthage_cache/swift_version_resolver"
+require "carthage_cache/build_collector"
+require "carthage_cache/carthage_cache_lock"
 
 module CarthageCache
 

data/lib/carthage_cache/application.rb

@@ -41,6 +41,7 @@ module CarthageCache
       prune_white_list ||= config.prune_white_list
 
       if force || !archive_exist?
+        carthage_cache_lock.write_lock_digest(project.archive_key)
         prune_build_directory(prune_white_list) if prune
         archive_builder.build(platforms)
       end
@@ -48,7 +49,7 @@ module CarthageCache
 
     def prune_build_directory(white_list)
       white_list ||= config.prune_white_list
-      
+
       if white_list && File.exist?(white_list)
         terminal.vputs "Prunning build directory with white list '#{white_list}' ..."
         white_list = YAML.load(File.read(white_list))
@@ -59,6 +60,16 @@ module CarthageCache
       build_collector.delete_unused_frameworks(white_list)
     end
 
+    def validate_installation
+      if carthage_cache_lock.valid_digest?(project.archive_key)
+        terminal.puts "You installation is valid."
+        true
+      else
+        terminal.puts "Your current Carthage digest '#{project.archive_key}' does not match digest '#{carthage_cache_lock.lock_digest}' in '#{carthage_cache_lock.lock_file_path}'"
+        false
+      end
+    end
+
     private
 
       def archive_installer
@@ -73,6 +84,10 @@ module CarthageCache
         @build_collector ||= BuildCollector.new(terminal, project.carthage_build_directory, project.all_frameworks)
       end
 
+      def carthage_cache_lock
+        @carthage_cache_lock ||= CarthageCacheLock.new(project.carthage_build_directory)
+      end
+
   end
 
 end

data/lib/carthage_cache/archive_builder.rb

@@ -31,7 +31,14 @@ module CarthageCache
         else
           terminal.puts "Archiving Carthage build directory for all platforms."
         end
-        filter_block = ->(platform) { platforms.map(&:downcase).include?(platform.downcase) } if platforms
+
+        filter_block = nil
+        if platforms
+          filter_block = ->(file) do
+            lock_file?(file) || platforms.map(&:downcase).include?(file.downcase)
+          end
+        end
+
         archiver.archive(project.carthage_build_directory, archive_path, &filter_block)
         archive_path
       end
@@ -41,6 +48,10 @@ module CarthageCache
         repository.upload(project.archive_filename, archive_path)
       end
 
+      def lock_file?(file)
+        file == CarthageCacheLock::LOCK_FILE_NAME
+      end
+
   end
 
 end

data/lib/carthage_cache/carthage_cache_lock.rb

@@ -0,0 +1,28 @@
+
+module CarthageCache
+
+  class CarthageCacheLock
+
+    LOCK_FILE_NAME = "CarthageCache.lock"
+
+    attr_reader :lock_file_path
+
+    def initialize(build_directory)
+      @lock_file_path = File.join(build_directory, LOCK_FILE_NAME)
+    end
+
+    def lock_digest
+      File.read(lock_file_path).strip if File.exist?(lock_file_path)
+    end
+
+    def write_lock_digest(digest)
+      File.open(lock_file_path, "w") { |f| f.write(digest) }
+    end
+
+    def valid_digest?(digest)
+      lock_digest == digest
+    end
+
+  end
+
+end

data/lib/carthage_cache/version.rb

@@ -1,3 +1,3 @@
 module CarthageCache
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carthage_cache
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Guido Marucci Blas
@@ -152,6 +152,7 @@ files:
 - lib/carthage_cache/archive_installer.rb
 - lib/carthage_cache/archiver.rb
 - lib/carthage_cache/build_collector.rb
+- lib/carthage_cache/carthage_cache_lock.rb
 - lib/carthage_cache/carthage_resolved_file.rb
 - lib/carthage_cache/configuration.rb
 - lib/carthage_cache/configuration_validator.rb