carthage_cache 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da15d9b92179c1ef699d0a5ed85869629ccee8db
-  data.tar.gz: ef4d5a77a49672356342377fc5689f7f1d06c50f
+  metadata.gz: 4d9073ae5c1c8c1606fae0af3e8fcbd4cc970174
+  data.tar.gz: a5b435d18b552a2f57e12ac5af3f644de3358340
 SHA512:
-  metadata.gz: d9d5d9f3b83ff9d91de56782e18d175a245563a3e9ae7a2ee4469b0cf2207c8f44c2a5be68c7069182285903958e057dc8c93e6ec176ce2b40b0c9bfaaf651b3
-  data.tar.gz: 00aeac5ac3d4a6539a6f5b5c2ab9f22462cfcd05636ccccb17a010e33ad12610403332ede8120f2ee7f74a4fa8586b2abd20ed116e7c1a795544a4dc4d68ef09
+  metadata.gz: 509ab485f2f00b67e736426445b0959627bea03ec853047f4c7db4907fa78c33189f1582569edae94ca162dd6922180e2f715fd0584d394edc8034c93923bd32
+  data.tar.gz: b236a7d83332526ca67f4b8448f0db7840186bbcf3102ebe76b4cef1b6cf46beea878cb6c7b2c56721583552ee6bfa63570c349e2ad7ecf11b59010b50ec28c6

data/carthage_cache.gemspec

@@ -28,7 +28,8 @@ 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_development_dependency "simplecov"
+  spec.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"
 
   spec.add_dependency "aws-sdk", "~> 2.0"
   spec.add_dependency "commander", "~> 4.3"

data/exe/carthage_cache

@@ -57,10 +57,10 @@ command :publish do |c|
   c.option '-w', '--prune-white-list PRUNE_WHITE_LIST', String, 'Path to a YAML file containing the prune white list.'
   c.option '-x', '--platforms PLATFORMS', String, 'A comma separated list of platforms that should be archived. Platforms not present in this list won\'t be archived'
   c.action do |args, options|
-    options.default force: false, prune: false
+    options.default force: false
     app = CarthageCache::Application.new(args.first || ".", verbose, config)
     platforms = options.platforms.split(",") if options.platforms
-    if platforms.empty?
+    if platforms && platforms.empty?
       puts "If you pass -x or --platforms option the you must specify at least one platform."
       exit 1
     end

data/lib/carthage_cache/application.rb

@@ -35,7 +35,11 @@ module CarthageCache
       end
     end
 
-    def create_archive(force = false, prune = false, prune_white_list = nil, platforms = nil)
+    def create_archive(force = false, prune = nil, prune_white_list = nil, platforms = nil)
+      prune ||= config.prune_on_publish
+      platforms ||= config.platforms
+      prune_white_list ||= config.prune_white_list
+
       if force || !archive_exist?
         prune_build_directory(prune_white_list) if prune
         archive_builder.build(platforms)
@@ -43,6 +47,8 @@ module CarthageCache
     end
 
     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))

data/lib/carthage_cache/archive_builder.rb

@@ -26,7 +26,11 @@ module CarthageCache
 
       def archive(platforms = nil)
         archive_path = File.join(project.tmpdir, project.archive_filename)
-        terminal.puts "Archiving Carthage build directory."
+        if platforms
+          terminal.puts "Archiving Carthage build directory for #{platforms.join(',')} platforms."
+        else
+          terminal.puts "Archiving Carthage build directory for all platforms."
+        end
         filter_block = ->(platform) { platforms.map(&:downcase).include?(platform.downcase) } if platforms
         archiver.archive(project.carthage_build_directory, archive_path, &filter_block)
         archive_path

data/lib/carthage_cache/configuration.rb

@@ -26,6 +26,9 @@ module CarthageCache
 
     def self.default
       @default ||= Configuration.new({
+        prune_on_publish: false,
+        platforms: nil,
+        prune_white_list: nil,
         aws_s3_client_options: {
           region: ENV['AWS_REGION'],
           access_key_id: ENV['AWS_ACCESS_KEY_ID'],
@@ -37,6 +40,9 @@ module CarthageCache
     end
 
     config_key :bucket_name
+    config_key :prune_on_publish
+    config_key :prune_white_list
+    config_key :platforms
     config_key :aws_region
     config_key :aws_access_key_id
     config_key :aws_secret_access_key

data/lib/carthage_cache/configurator.rb

@@ -40,7 +40,7 @@ module CarthageCache
       def load_config
         if config_file_exist?
           config = Configuration.parse(File.read(config_file_path))
-          config = config.merge(base_config)
+          config = base_config.merge(config)
         else
           base_config
         end

data/lib/carthage_cache/configurator_wizard.rb

@@ -10,6 +10,7 @@ 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.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?")
@@ -28,6 +29,10 @@ module CarthageCache
         end
       end
 
+      def confirm(message)
+        ask("#{message} [N/y]").downcase == 'y'
+      end
+
       def password(message)
         @password_proc.call(message)
       end

data/lib/carthage_cache/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carthage_cache
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Guido Marucci Blas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,6 +80,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: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement