xcode-archive-cache 0.0.9 → 0.0.11

data/lib/shell/executor.rb

@@ -12,7 +12,7 @@ module XcodeArchiveCache
         output, status = Open3.capture2e(actual_command)
 
         if status.exitstatus != 0
-          raise Informative, "#{command}\nexecution failed\n#{output}"
+          raise XcodeArchiveCache::Informative, "#{command}\nexecution failed\n#{output}"
         end
 
         output
@@ -31,6 +31,18 @@ module XcodeArchiveCache
         result
       end
 
+      # @param [String] command
+      # @param [Hash] env
+      #
+      # @return [Boolean] true if command succeeded and returned 0, false otherwise
+      #
+      def execute_with_env(command, env)
+        result = system(env, "set -x && '#{command}'")
+
+        return false if result == nil
+        result
+      end
+
       private
 
       # @param [String] command
@@ -57,12 +69,12 @@ module XcodeArchiveCache
       # @return [String]
       #
       def pipefail_flags(print_command)
-        flags = %w(e o)
+        flags = ["e", "o pipefail"]
         if print_command
           flags.insert(1, "x")
         end
 
-        "-" + flags.join("")
+        "-" + flags.join(" -")
       end
     end
   end

data/lib/xcode-archive-cache.rb

@@ -45,6 +45,11 @@ require 'injection/dependency_remover'
 require 'injection/headers_mover'
 require 'injection/storage'
 require 'injection/framework_embedder'
+require 'injection/pods_xcframework_fixer'
+
+require 'modulemap/file_handler'
+require 'modulemap/header_path_extractor'
+require 'modulemap/header_path_fixer'
 
 require 'runner/runner'
 
@@ -52,6 +57,9 @@ require 'shell/executor'
 
 require 'xcodebuild/executor'
 
+require 'extensions/target'
+require 'extensions/build_configuration'
+
 module XcodeArchiveCache
   class Informative < StandardError
     include CLAide::InformativeError

data/lib/xcodebuild/executor.rb

@@ -55,6 +55,10 @@ module XcodeArchiveCache
         shell_executor.execute(command, true)
       end
 
+      def set_up_for_simulator?
+        destination_flag.include?("Simulator")
+      end
+
       private
 
       # @return [String]
@@ -113,7 +117,7 @@ module XcodeArchiveCache
         #
         inferred_destination = action == ARCHIVE_ACTION ? GENERIC_DESTINATION : destination_by_platform
         if inferred_destination == nil
-          raise Informative, "Destination not set for #{platform} platform"
+          raise XcodeArchiveCache::Informative, "Destination not set for #{platform} platform"
         end
 
         destination_specifier = inferred_destination == GENERIC_DESTINATION ? "generic/platform=#{platform}" : inferred_destination

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-archive-cache
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - Ilya Dyakonov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -36,20 +36,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: xcpretty
   requirement: !ruby/object:Gem::Requirement
@@ -78,8 +78,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: 
-email: 
+description:
+email:
 executables:
 - xcode-archive-cache
 extensions: []
@@ -107,14 +107,20 @@ files:
 - lib/command/inject.rb
 - lib/config/config.rb
 - lib/config/dsl.rb
+- lib/extensions/build_configuration.rb
+- lib/extensions/target.rb
 - lib/injection/build_flags_changer.rb
 - lib/injection/dependency_remover.rb
 - lib/injection/framework_embedder.rb
 - lib/injection/headers_mover.rb
 - lib/injection/injector.rb
 - lib/injection/pods_script_fixer.rb
+- lib/injection/pods_xcframework_fixer.rb
 - lib/injection/storage.rb
 - lib/logs/logs.rb
+- lib/modulemap/file_handler.rb
+- lib/modulemap/header_path_extractor.rb
+- lib/modulemap/header_path_fixer.rb
 - lib/runner/runner.rb
 - lib/shell/executor.rb
 - lib/xcode-archive-cache.rb
@@ -123,7 +129,7 @@ homepage: https://github.com/sweatco/xcode-archive-cache
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,8 +144,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Native targets cache for Xcode archive builds.
 test_files: []