carthage_cache 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14c557ec9aff88645661930d8726c26353cf9eb1
-  data.tar.gz: d4f6a67baf8b14d2e20ba7cfeca16fbf413dc22d
+  metadata.gz: fdeb2c1edb2a91fad5618b77bdce1b3a9bc47805
+  data.tar.gz: 268f0b7787a0483b3560750d343d588885a37b50
 SHA512:
-  metadata.gz: f8cb4a55c9a8887c655e1103a51ee3ec6db841137aab8ba97327608e9b286dafe71b4186bececa928f0a22658c298bb69c632ca0e6313bc1a64521d27f6cb390
-  data.tar.gz: aa0922188cc9ec64a75194f6b7ea7fa9152d3ff947099f32d497be7f4eface163481b39c91f3b18072e968d7b36ae552c29283b3039cc0e7bfdf6e18c2267508
+  metadata.gz: bef1b5390c853648e71cdbffcf06dc94830be0ee5bd45460fab484616cf323cc53355e4cf9327b636a19952ac2ad67a11f50032418ef985c34a2c371aece40ce
+  data.tar.gz: 6cdfcc331e81e216964c4660ec1bdde7325880e3678c91ea13b4bb383b76289418e1f3eb644838841fdec3567676e69c2a631e619f7e77fef8a4d0fe114c191c

data/.ruby-version

@@ -1 +1 @@
-2.2.2
+2.3.1

data/.travis.yml

@@ -3,7 +3,7 @@ os:
 language: ruby
 cache: bundler
 rvm:
-  - 2.2.2
+  - 2.3.1
   # OS X 10.9.5-10.10.0 (2.0.0-p481)
   - system
   # OS X 10.9.3-10.9.4

data/README.md

@@ -14,6 +14,8 @@ When you add slow building environments like Travis CI to the mix, a project boo
 CarthageCache generates a hash key based on the content of your `Cartfile.resolved` and the current
 installed version of Swift. Then it checks if there is a cache archive (a zip file of your `Carthage/Build` directory) associated to that hash. If there is one it will download it and install it in your project avoiding the need to run `carthage bootstrap`.
 
+**Do you want to improve carthage_cache?** [Check all the issues tagged with `help-wanted`!](https://github.com/guidomb/carthage_cache/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22). I'll be more than happy to review your pull request.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/carthage_cache/build_collector.rb

@@ -7,24 +7,22 @@ module CarthageCache
     attr_reader :terminal
     attr_reader :build_directory
     attr_reader :required_frameworks
+    attr_reader :command_executor
 
-    def initialize(terminal, build_directory, required_frameworks)
+    def initialize(terminal, build_directory, required_frameworks, command_executor = ShellCommandExecutor.new)
       @terminal = terminal
       @build_directory = build_directory
       @required_frameworks = Set.new(required_frameworks)
+      @command_executor = command_executor
     end
 
     def delete_unused_frameworks(white_list = {})
       terminal.vputs "Deleting unused frameworks from '#{build_directory}' ..."
       list_built_frameworks.each do |framework_path|
         if delete_framework?(framework_path, white_list)
-          terminal.vputs "Deleting '#{framework_path}' because is not longer needed."
-          FileUtils.rm_r(framework_path)
+          delete_framework_files(framework_path)
         end
       end
-
-      symbol_table_files.each { |x| FileUtils.rm_r(x) }
-      dsym_files.each { |x| FileUtils.rm_r(x) }
     end
 
     private
@@ -42,16 +40,33 @@ module CarthageCache
         Dir[File.join(build_directory, "/**/*.framework")]
       end
 
-      def symbol_table_files
-        Dir[File.join(build_directory, "/**/*.bcsymbolmap")]
+      def framework_name(framework_path)
+        Pathname.new(framework_path).basename(".framework").to_s
+      end
+
+      def delete_framework_files(framework_path)
+        framework_dsym_path = "#{framework_path}.dSYM"
+        terminal.vputs "Deleting #{framework_name(framework_path)} files because they are no longer needed ..."
+        terminal.vputs "Deleting '#{framework_dsym_path}' ..."
+        FileUtils.rm_r(framework_dsym_path)
+        terminal.vputs "Deleting '#{framework_path}' ..."
+        FileUtils.rm_r(framework_path)
+        symbol_map_files(framework_dsym_path).each do |symbol_table_file|
+          terminal.vputs "Deleting '#{symbol_table_file}' ..."
+          FileUtils.rm(symbol_table_file)
+        end
+        terminal.vputs ""
       end
 
-      def dsym_files
-        Dir[File.join(build_directory, "/**/*.dSYM")]
+      def symbol_map_files(framework_dsym_path)
+        uuid_dwarfdump(framework_dsym_path)
+          .split("\n")
+          .map { |line| line.match(/UUID: (.*) \(/)[1] }
+          .map { |uuid| File.expand_path(File.join(framework_dsym_path, "../#{uuid}.bcsymbolmap")) }
       end
 
-      def framework_name(framework_path)
-        Pathname.new(framework_path).basename(".framework").to_s
+      def uuid_dwarfdump(framework_dsym_path)
+        command_executor.execute("/usr/bin/xcrun dwarfdump --uuid #{framework_dsym_path}")
       end
 
   end

data/lib/carthage_cache/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carthage_cache
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Guido Marucci Blas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A tool that allows to cache Carthage/Build folder in Amazon S3.