carthage_cache 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ab673e65db5cb1ad9be9dc6d801c77f929b9801
-  data.tar.gz: 94ec477e9efa5bc86d0c4467a05a417510820559
+  metadata.gz: d3968542f17e4b0fc12ad64c233b8e3117442802
+  data.tar.gz: 5d472030fa6884847e60146d716e8b7b8ed086b9
 SHA512:
-  metadata.gz: 8804d8df4003d49ad01243d9b1bc4b42d685bc4692c82eeec59b5c73c196cfb22c8b9c6c51030a2d01c8ba16109b9ac5383ea8e231f2fc01b6da49401885bf2f
-  data.tar.gz: a6d6a9e4bd2790e341585a5ff5d21ff0da36a9b2b0590c5ef648e9b0e118e063681c9c9cd9713b9a7bca0b4a59051c63dd9c7a187ef90a90cb9e538911fa21d1
+  metadata.gz: 1dd5710d6ef0e501ac5e397e812bb9c610d4ca1421fe077f823044c446951a1e028d75f575ca59b9ae029c3e48cfc46415f18fe4e7843d09924cc3babdb09f86
+  data.tar.gz: 6c01a8e6621c535afe942f4960b6340ac2a032b9b70f1d3d5c1915bab905f2525565f4a30ca7a2faa544f0ce1ec93de69324003677c373fd17385819525c5156

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.4.2

data/.travis.yml

@@ -2,12 +2,9 @@ os:
   - osx
 language: ruby
 cache: bundler
+osx_image: xcode9
 rvm:
-  - 2.3.1
-  # OS X 10.9.5-10.10.0 (2.0.0-p481)
-  - system
-  # OS X 10.9.3-10.9.4
-  - 2.0.0-p451
+  - 2.4.2
 
 branches:
   only:

data/README.md

@@ -49,6 +49,7 @@ You can also set your credentials using the following environmental variables
  * `AWS_REGION`
  * `AWS_ACCESS_KEY_ID`
  * `AWS_SECRET_ACCESS_KEY`
+ * `AWS_SESSION_TOKEN` # optional, for [temporary security credentials](http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp.html)
 
 Or if you prefer using [AWS Named Profiles](http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html#cli-multiple-profiles), you can use the following environmental variables instead
 
@@ -62,7 +63,7 @@ CarthageCache will assume there is a bucket named `carthage-cache`. You can chan
 ### 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:
+Create a policy with the following permissions:
 ```
 {
     "Version": "2012-10-17",
@@ -154,7 +155,7 @@ carthage_cache help
 
 ### OSS project
 
-In an OSS project you wouldn't store AWS credentials anywhere since anyone can have access, even if you have a build like travis that supports for encrypted variables but these are not available in your contributors pull requests build. 
+In an OSS project you wouldn't store AWS credentials anywhere since anyone can have access, even if you have a build like travis that supports for encrypted variables but these are not available in your contributors pull requests build.
 
 In order allow your build to run in these circumstances, you can avoid defining these variables
 
@@ -181,7 +182,7 @@ The only requirement is to make the action `s3:GetObject` avaible for any anonym
 }
 ```
 
-> Please know that this will make all your dependencies **PUBLIC** and accessible for anyone, so if you have sensitive information or propietary code there you should avoid this configuration.
+> Please know that this will make all your dependencies **PUBLIC** and accessible for anyone, so if you have sensitive information or proprietary code there you should avoid this configuration.
 
 ### Project's root directory
 

data/Rakefile

@@ -3,4 +3,10 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+# target that generates junit test report for CI builds
+RSpec::Core::RakeTask.new(:ci_spec) do |t|
+  t.fail_on_error = false
+  t.rspec_opts = "--no-drb -r rspec_junit_formatter --format RspecJunitFormatter -o junit.xml"
+end
+
+task :default => :spec 

data/carthage_cache.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
     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.
   }
-  spec.homepage      = "https://github.com/guidomb/carthage_cache"
+  spec.homepage      = "https://github.com/wolox/carthage_cache"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"
+  spec.add_development_dependency "rspec_junit_formatter", "~> 0.2.3"
 
   spec.add_dependency "aws-sdk", "~> 2.0"
   spec.add_dependency "commander", "~> 4.3"

data/lib/carthage_cache/application.rb

@@ -18,11 +18,11 @@ module CarthageCache
       @config = Configurator.new(@terminal, project_path, config).config
       clazz = @config.read_only? ? HTTPRepository : repository
       @repository = clazz.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)
+      @project = Project.new(project_path, CACHE_DIR_NAME, @config.archive_base_path, @terminal, @config.tmpdir, swift_version_resolver.new)
     end
 
     def archive_exist?
-      repository.archive_exist?(project.archive_filename)
+      repository.archive_exist?(project.archive_path)
     end
 
     def install_archive
@@ -51,18 +51,18 @@ module CarthageCache
       white_list ||= config.prune_white_list
 
       if white_list && File.exist?(white_list)
-        terminal.vputs "Prunning build directory with white list '#{white_list}' ..."
+        terminal.vputs "Pruning build directory with white list '#{white_list}' ..."
         white_list = YAML.load(File.read(white_list))
       else
         white_list = {}
-        terminal.vputs "Prunning build directory ..."
+        terminal.vputs "Pruning build directory ..."
       end
       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."
+        terminal.puts "Your 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}'"

data/lib/carthage_cache/archive_builder.rb

@@ -45,7 +45,7 @@ module CarthageCache
 
       def upload_archive(archive_path)
         terminal.puts "Uploading archive with key '#{project.archive_key}'."
-        repository.upload(project.archive_filename, archive_path)
+        repository.upload(project.archive_path, archive_path)
       end
 
       def lock_file?(file)

data/lib/carthage_cache/archive_installer.rb

@@ -36,7 +36,7 @@ module CarthageCache
           terminal.puts "Archive with key '#{archive_path}' already downloaded in local cache."
         else
           terminal.puts "Downloading archive with key '#{archive_path}'."
-          repository.download(project.archive_filename, archive_path)
+          repository.download(project.archive_path, archive_path)
         end
 
         archive_path

data/lib/carthage_cache/archiver.rb

@@ -11,6 +11,7 @@ module CarthageCache
     def archive(archive_path, destination_path, &filter_block)
       files = Dir.entries(archive_path).select { |x| !x.start_with?(".") }
       files = files.select(&filter_block) if filter_block
+      files = files.sort_by(&:downcase)
       executor.execute("cd #{archive_path} && zip -r -X #{File.expand_path(destination_path)} #{files.join(' ')} > /dev/null")
     end
 

data/lib/carthage_cache/configuration.rb

@@ -33,9 +33,12 @@ module CarthageCache
           region: ENV['AWS_REGION'],
           access_key_id: ENV['AWS_ACCESS_KEY_ID'],
           secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
-          profile: ENV['AWS_PROFILE']
+          profile: ENV['AWS_PROFILE'],
+          session_token: ENV['AWS_SESSION_TOKEN']
+          
         },
-        tmpdir: File.join(Dir.home, 'Library', 'Caches')
+        tmpdir: File.join(Dir.home, 'Library', 'Caches'),
+        archive_base_path: nil
       })
     end
 
@@ -48,6 +51,8 @@ module CarthageCache
     config_key :aws_secret_access_key
     config_key :aws_profile
     config_key :tmpdir
+    config_key :aws_session_token
+    config_key :archive_base_path
 
     attr_reader :hash_object
 
@@ -68,10 +73,15 @@ module CarthageCache
     end
 
     def merge(c)
+      other_hash = nil
       if c.is_a?(Hash)
-        @hash_object = hash_object.merge(c)
+        other_hash = c
       else
-        @hash_object = hash_object.merge(c.hash_object)
+        other_hash = c.hash_object
+      end
+
+      @hash_object = hash_object.merge(other_hash) do |key, oldval, newval|
+        if oldval.is_a?(Hash) then oldval.merge(newval) end
       end
       self
     end

data/lib/carthage_cache/configuration_validator.rb

@@ -13,7 +13,7 @@ module CarthageCache
 
     def self.missing_aws_key(keyname, name)
       solution =  "You need to specify the AWS #{name} to be used.\n"     \
-                  "You can either define a enviromental variable "        \
+                  "You can either define a environmental variable "        \
                   "AWS_REGION or add ':#{keyname}: YOUR_KEY_VALUE' "      \
                   "under the :aws_s3_client_options: key in the "         \
                   ".carthage_cache.yml file.\nYou can also run "          \

data/lib/carthage_cache/configurator_wizard.rb

@@ -10,18 +10,25 @@ module CarthageCache
     def start
       config = Configuration.new
       config.bucket_name = ask("What is the Amazon S3 bucket name?", ENV["CARTHAGE_CACHE_DEFAULT_BUCKET_NAME"])
+      config.archive_base_path = ask("What base path do you want to use as archive's prefix? (default none)", nil)
       config.prune_on_publish = confirm("Do you want to prune unused framework when publishing?")
       config.aws_region = ask("What is the Amazon S3 region?")
       config.aws_access_key_id = password("What is the AWS access key?")
       config.aws_secret_access_key = password(" What is the AWS secret access key?")
+      config.aws_session_token = ask("What is the AWS session token (optional)?", nil, "*") 
       config
     end
 
     private
 
-      def ask(message, default_value = nil)
+      def ask(message, default_value = nil, mask = nil)
         message = "#{message} [#{default_value}]" if default_value
-        answer = @ask_proc.call(message)
+        if mask
+          answer = @ask_proc.call(message) { |q| q.echo = mask } 
+        else
+          answer = @ask_proc.call(message)  
+        end
+        
         if answer.empty?
           default_value
         else
@@ -30,11 +37,11 @@ module CarthageCache
       end
 
       def confirm(message)
-        ask("#{message} [N/y]").downcase == 'y'
+        ask("#{message} [N/y]", 'N').downcase == 'y'
       end
 
       def password(message)
-        @password_proc.call(message)
+         @password_proc.call(message)
       end
 
   end

data/lib/carthage_cache/project.rb

@@ -4,13 +4,15 @@ module CarthageCache
 
     attr_reader :cartfile
     attr_reader :project_path
+    attr_reader :archive_base_path
     attr_reader :cache_dir_name
     attr_reader :terminal
     attr_reader :tmpdir_base_path
 
-    def initialize(project_path, cache_dir_name, terminal, tmpdir, swift_version_resolver = SwiftVersionResolver.new)
+    def initialize(project_path, cache_dir_name, archive_base_path, terminal, tmpdir, swift_version_resolver = SwiftVersionResolver.new)
       @project_path = project_path
       @cache_dir_name = cache_dir_name
+      @archive_base_path = archive_base_path
       @terminal = terminal
       @tmpdir_base_path = tmpdir
       @cartfile = CartfileResolvedFile.new(cartfile_resolved_path, terminal, swift_version_resolver)
@@ -20,6 +22,14 @@ module CarthageCache
       @archive_filename ||= "#{archive_key}.zip"
     end
 
+    def archive_path
+      if @archive_base_path.nil?
+        @archive_path ||= archive_filename
+      else 
+        @archive_path ||= File.join(archive_base_path, archive_filename)
+      end
+    end
+
     def archive_key
       cartfile.digest
     end

data/lib/carthage_cache/version.rb

@@ -1,3 +1,3 @@
 module CarthageCache
-  VERSION = "0.8.3"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carthage_cache
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Guido Marucci Blas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +179,7 @@ files:
 - lib/carthage_cache/swift_version_resolver.rb
 - lib/carthage_cache/terminal.rb
 - lib/carthage_cache/version.rb
-homepage: https://github.com/guidomb/carthage_cache
+homepage: https://github.com/wolox/carthage_cache
 licenses:
 - MIT
 metadata: {}
@@ -185,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A tool that allows to cache Carthage/Build folder in Amazon S3.