carthage_cache 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2089e06c1e9dd96ac5b71936112aad082d5486bb
-  data.tar.gz: 901326e842a9972dbc4b21482a454f5003d7cca6
+  metadata.gz: 8c1088f79834754ab5253f660ae875d825eb7c4e
+  data.tar.gz: ac83ce8bce893e65bcc95113ae9a2da2e1562894
 SHA512:
-  metadata.gz: f60a957f58db7ebaebec335b7e043f09efd79a61a599d52ad438d41818367e46db0088a3be09d9eaa466a8f45d7e2e63c5e9477344b3e93e79386abba9a46cc7
-  data.tar.gz: ce5d76ee4e9f936cc95d02f2028abab5d102f4ad58a36d219c1f9ed25a3129d31b9ff864e5e41ea93611e11e5f4bed2f312e70835a6d1112f1974975cfa90c77
+  metadata.gz: 1ed7c130a44dc91ac3dc85c31123e9cccc1a0ee104af3cc55a96253ea13140ad0a3bac2ef29b3401f7805057e743310c1df4472f7ed0a1cdf06ceccc71a45e36
+  data.tar.gz: f38f45564c0044d742307ae36dc18bd10703599d3c1202817ba1c1155931d48817eed3da047069276923a967f88216b484d25881d21a2400069db7da056eb213

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+Carthage/

data/.travis.yml

@@ -3,7 +3,6 @@ os:
 language: ruby
 cache: bundler
 rvm:
-  - head
   - 2.2.2
   # OS X 10.9.5-10.10.0 (2.0.0-p481)
   - system
@@ -14,4 +13,8 @@ branches:
   only:
     - master
 
-before_install: gem install bundler -v 1.10.6
+before_install: sudo gem install bundler
+
+addons:
+    code_climate:
+        repo_token: 6220ef8896c380cb590d4640621d1fc4c0d6d36ccc24d3d818cfba76bbd50014

data/README.md

@@ -1,5 +1,6 @@
 # CarthageCache
 
+[![Build Status](https://travis-ci.org/guidomb/carthage_cache.svg?branch=master)](https://travis-ci.org/guidomb/carthage_cache)
 [![Code Climate](https://codeclimate.com/github/guidomb/carthage_cache/badges/gpa.svg)](https://codeclimate.com/github/guidomb/carthage_cache)
 [![Test Coverage](https://codeclimate.com/github/guidomb/carthage_cache/badges/coverage.svg)](https://codeclimate.com/github/guidomb/carthage_cache/coverage)
 [![Gem Version](https://badge.fury.io/rb/carthage_cache.svg)](https://badge.fury.io/rb/carthage_cache)
@@ -10,7 +11,8 @@ Most libraries don't provide pre-compiled binaries, `.framework` files, in their
 
 When you add slow building environments like Travis CI to the mix, a project bootstrap could take around 25 minutes just to build all your dependencies. Which is a lot for every push or pull request. You want your build and test to run really fast.
 
-CarthageCache generates a hash key based on the content of your `Cartfile.resolved` and 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`.
+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`.
 
 ## Installation
 
@@ -50,6 +52,41 @@ You can also set your credentials using the following environmental variables
 
 CarthageCache will assume there is a bucket named `carthage-cache`. You can change the bucket to be used by using the option `-b` or `--bucket-name`.
 
+### IAM Policy
+
+Once you create the bucket, you will need to create a user. Go to the IAM section and create a new user. Create a new group, and add the new user to that group.
+Create a policy with the following permisions:
+```
+{
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Sid": "autogenerated-id",
+            "Effect": "Allow",
+            "Action": [
+                "s3:ListBucket"
+            ],
+            "Resource": [
+                "arn:aws:s3:::carthage-cache"
+            ]
+        },
+        {
+            "Sid": "autogenerated-id",
+            "Effect": "Allow",
+            "Action": [
+                "s3:DeleteObject",
+                "s3:GetObject",
+                "s3:PutObject"
+            ],
+            "Resource": [
+                "arn:aws:s3:::carthage-cache/*"
+            ]
+        }
+    ]
+}
+```
+Don't forget to attach the policy to the group.
+
 ## Usage
 
 If you want to bootstrap a project from cache and if there is none then fallback to Carthage.

data/carthage_cache.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "codeclimate-test-reporter"
 
   spec.add_dependency "aws-sdk", "~> 2.2.3"
   spec.add_dependency "commander", "~> 4.3.8"

data/exe/carthage_cache

@@ -45,7 +45,7 @@ command :install do |c|
   c.description = 'Installs the cache archive for the current Cartfile.resolved.'
   c.action do |args, options|
     app = CarthageCache::Application.new(args.first || ".", verbose, config)
-    app.install_archive
+    exit 1 unless app.install_archive
   end
 end
 

data/lib/carthage_cache.rb

@@ -10,54 +10,10 @@ require "carthage_cache/terminal"
 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"
 
 module CarthageCache
 
-  class Application
-
-    CACHE_DIR_NAME = "carthage_cache"
-
-    attr_reader :terminal
-    attr_reader :archiver
-    attr_reader :repository
-    attr_reader :project
-    attr_reader :config
-
-    def initialize(project_path, verbose, config)
-      @terminal = Terminal.new(verbose)
-      @archiver = Archiver.new
-      @config = Configurator.new(project_path, config).config
-      @repository = Repository.new(@config.bucket_name, @config.hash_object[:aws_s3_client_options])
-      @project = Project.new(project_path, CACHE_DIR_NAME, terminal)
-    end
-
-    def archive_exist?
-      repository.archive_exist?(project.archive_filename)
-    end
-
-    def install_archive
-      if archive_exist?
-        archive_installer.install
-      else
-        terminal.puts "There is no cached archive for the current Cartfile.resolved file."
-        exit 1
-      end
-    end
-
-    def create_archive(force = false)
-      archive_builder.build if force || !archive_exist?
-    end
-
-    private
-
-      def archive_installer
-        @archive_installer ||= ArchiveInstaller.new(terminal, repository, archiver, project)
-      end
-
-      def archive_builder
-        @archive_builder ||= ArchiveBuilder.new(terminal, repository, archiver, project)
-      end
-
-  end
-
 end

data/lib/carthage_cache/application.rb

@@ -0,0 +1,51 @@
+module CarthageCache
+
+  class Application
+
+    CACHE_DIR_NAME = "carthage_cache"
+
+    attr_reader :terminal
+    attr_reader :archiver
+    attr_reader :repository
+    attr_reader :project
+    attr_reader :config
+
+    def initialize(project_path, verbose, config, repository: Repository, terminal: Terminal, swift_version_resolver: SwiftVersionResolver)
+      @terminal = terminal.new(verbose)
+      @archiver = Archiver.new
+      @config = Configurator.new(project_path, config).config
+      @repository = repository.new(@config.bucket_name, @config.hash_object[:aws_s3_client_options])
+      @project = Project.new(project_path, CACHE_DIR_NAME, terminal, @config.tmpdir, swift_version_resolver.new)
+    end
+
+    def archive_exist?
+      repository.archive_exist?(project.archive_filename)
+    end
+
+    def install_archive
+      if archive_exist?
+        archive_installer.install
+        true
+      else
+        terminal.puts "There is no cached archive for the current Cartfile.resolved file."
+        false
+      end
+    end
+
+    def create_archive(force = false)
+      archive_builder.build if force || !archive_exist?
+    end
+
+    private
+
+      def archive_installer
+        @archive_installer ||= ArchiveInstaller.new(terminal, repository, archiver, project)
+      end
+
+      def archive_builder
+        @archive_builder ||= ArchiveBuilder.new(terminal, repository, archiver, project)
+      end
+
+  end
+
+end

data/lib/carthage_cache/archiver.rb

@@ -2,13 +2,19 @@ module CarthageCache
 
   class Archiver
 
+    attr_reader :executor
+
+    def initialize(executor = ShellCommandExecutor.new)
+      @executor = executor
+    end
+
     def archive(archive_path, destination_path)
       files = Dir.entries(archive_path).select { |x| !x.start_with?(".") }
-      `cd #{archive_path} && zip -r -X #{File.expand_path(destination_path)} #{files.join(' ')} > /dev/null`
+      executor.execute("cd #{archive_path} && zip -r -X #{File.expand_path(destination_path)} #{files.join(' ')} > /dev/null")
     end
 
     def unarchive(archive_path, destination_path)
-      `unzip -o #{archive_path} -d #{destination_path} > /dev/null`
+      executor.execute("unzip -o #{archive_path} -d #{destination_path} > /dev/null")
     end
 
   end

data/lib/carthage_cache/carthage_resolved_file.rb

@@ -6,18 +6,23 @@ module CarthageCache
 
     attr_reader :file_path
 
-    def initialize(file_path)
+    def initialize(file_path, swift_version_resolver = SwiftVersionResolver.new)
       @file_path = file_path
+      @swift_version_resolver = swift_version_resolver
     end
 
     def digest
-      @digest ||= Digest::SHA256.hexdigest(content)
+      @digest ||= Digest::SHA256.hexdigest(content + "#{swift_version}")
     end
 
     def content
       @content ||= File.read(file_path)
     end
 
+    def swift_version
+      @swift_version ||= @swift_version_resolver.swift_version
+    end
+
   end
 
 end

data/lib/carthage_cache/configuration.rb

@@ -32,7 +32,8 @@ module CarthageCache
           region: ENV['AWS_REGION'],
           access_key_id: ENV['AWS_ACCESS_KEY_ID'],
           secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
-        }
+        },
+        tmpdir: Dir.tmpdir
       })
     end
 
@@ -40,6 +41,7 @@ module CarthageCache
     config_key :aws_region
     config_key :aws_access_key_id
     config_key :aws_secret_access_key
+    config_key :tmpdir
 
     attr_reader :hash_object
 

data/lib/carthage_cache/project.rb

@@ -6,12 +6,14 @@ module CarthageCache
     attr_reader :project_path
     attr_reader :cache_dir_name
     attr_reader :terminal
+    attr_reader :tmpdir_base_path
 
-    def initialize(project_path, cache_dir_name, terminal)
+    def initialize(project_path, cache_dir_name, terminal, tmpdir, swift_version_resolver = SwiftVersionResolver.new)
       @project_path = project_path
       @cache_dir_name = cache_dir_name
       @terminal = terminal
-      @cartfile = CartfileResolvedFile.new(cartfile_resolved_path)
+      @tmpdir_base_path = tmpdir
+      @cartfile = CartfileResolvedFile.new(cartfile_resolved_path, swift_version_resolver)
     end
 
     def archive_filename
@@ -37,7 +39,7 @@ module CarthageCache
       end
 
       def create_tmpdir
-        dir = File.join(Dir.tmpdir, cache_dir_name)
+        dir = File.join(tmpdir_base_path, cache_dir_name)
         unless File.exist?(dir)
           terminal.vputs "Creating carthage cache directory at '#{dir}'."
           FileUtils.mkdir_p(dir)

data/lib/carthage_cache/shell_command_executor.rb

@@ -0,0 +1,11 @@
+module CarthageCache
+
+  class ShellCommandExecutor
+
+    def execute(command)
+      `#{command}`
+    end
+
+  end
+
+end

data/lib/carthage_cache/swift_version_resolver.rb

@@ -0,0 +1,17 @@
+module CarthageCache
+
+  class SwiftVersionResolver
+
+    def initialize(executor = ShellCommandExecutor.new)
+      @executor = executor
+    end
+
+    def swift_version
+      output = @executor.execute('xcrun swift -version').chomp
+      version_string = /(\d+\.)?(\d+\.)?(\d+)/.match(output).to_s
+      Gem::Version.new(version_string)
+    end
+
+  end
+
+end

data/lib/carthage_cache/version.rb

@@ -1,3 +1,3 @@
 module CarthageCache
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carthage_cache
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Guido Marucci Blas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +133,7 @@ files:
 - carthage_cache.gemspec
 - exe/carthage_cache
 - lib/carthage_cache.rb
+- lib/carthage_cache/application.rb
 - lib/carthage_cache/archive_builder.rb
 - lib/carthage_cache/archive_installer.rb
 - lib/carthage_cache/archiver.rb
@@ -129,6 +144,8 @@ files:
 - lib/carthage_cache/description.rb
 - lib/carthage_cache/project.rb
 - lib/carthage_cache/repository.rb
+- lib/carthage_cache/shell_command_executor.rb
+- lib/carthage_cache/swift_version_resolver.rb
 - lib/carthage_cache/terminal.rb
 - lib/carthage_cache/version.rb
 homepage: https://github.com/guidomb/carthage_cache