cocoapods-pack 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7af3571aa4edfe460d66288d0fafbad633ae65dda5b32c23d49329553794766c
-  data.tar.gz: d0e3b054e1a139e537c7ab58102b87362a569e3d82cd0b72e663c3dc169d7e6b
+  metadata.gz: 9402ffd0f5fec5e0a6f11e69df8ee7f7bca805926f8d1a33d557242f31750bac
+  data.tar.gz: 44bf92af47545da8ead9ed34b3bbd424ca3ed4a189ccf5b18ee304d78dd8fdb8
 SHA512:
-  metadata.gz: 7075f5e1bff6c872aa23677ce59023d6cacabe96af84d6e2e0323a5bd20879c591c9b9e09f407d8c5b67f7b0f15a8011d16bb3d8467b3498691deb36f59b53c6
-  data.tar.gz: d5c00f5e6765dc443489680b42b5a7f8a6ca852d9fdddc233e317673d0aef145e9497139d418b4c78b1b90355cd21894233c4f83c8629218d9a1602383b47599
+  metadata.gz: 14835189ad2ec33212a4522b69121856dd0f9a6e9c3ea2b837156342c94aebf20fa69960d9382fd2e668249d31ad6f0178e11c3c9ee4a8b750ab0746621e9a39
+  data.tar.gz: 9457e753fc27a00cd9609e9ab2fcba821aabdaff9973dd5ae85660a972066dade90b3d7f78a6467715319802b9bd2d127d0a7a75b8d67d63e647f1a21f73a395

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    cocoapods-pack (1.0.0)
-      rubyzip (~> 1.1)
+    cocoapods-pack (1.0.1)
+      cocoapods (>= 1.10, < 2.0)
+      rubyzip (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.4)
+    CFPropertyList (3.0.5)
       rexml
     activesupport (5.2.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -81,7 +82,7 @@ GEM
     nap (1.1.0)
     netrc (0.11.0)
     parallel (1.21.0)
-    parser (3.0.2.0)
+    parser (3.0.3.1)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
@@ -89,7 +90,7 @@ GEM
     public_suffix (4.0.6)
     rainbow (3.0.0)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -113,11 +114,11 @@ GEM
       rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.13.0)
+    rubocop-ast (1.14.0)
       parser (>= 3.0.1.1)
     ruby-macho (2.5.1)
     ruby-progressbar (1.11.0)
-    rubyzip (1.3.0)
+    rubyzip (2.3.2)
     thread_safe (0.3.6)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
@@ -138,7 +139,6 @@ PLATFORMS
 DEPENDENCIES
   activesupport (~> 5.0)
   bundler (~> 2.0)
-  cocoapods (>= 1.10, < 2.0)
   cocoapods-pack!
   pry (~> 0.10)
   rake (~> 13.0)

data/cocoapods-pack.gemspec

@@ -23,12 +23,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.required_ruby_version = '>= 2.5.0'
-  spec.add_development_dependency 'bundler', '~> 2.0'
+
+  spec.add_dependency 'cocoapods', '>= 1.10', '< 2.0'
+  spec.add_dependency 'rubyzip', '~> 2.0'
 
   spec.add_development_dependency 'activesupport', '~> 5.0'
-  spec.add_development_dependency 'cocoapods', '>= 1.10', '< 2.0'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_dependency 'rubyzip', '~> 1.1'
 end

data/lib/cocoapods-pack/command/pack.rb

@@ -41,6 +41,10 @@ module Pod
           Dir.glob(File.join(path, 'BCSymbolMaps', '*.bcsymbolmap'))
         end
 
+        def empty?
+          Dir.empty?(File.join(path, 'Products'))
+        end
+
         def modules_path
           "#{framework_path}/Modules"
         end
@@ -119,6 +123,7 @@ module Pod
         FileUtils.rm_rf(stage_dir)
         FileUtils.mkdir_p(stage_dir)
         source_urls = @source_urls.map { |url| Config.instance.sources_manager.source_with_name_or_url(url) }.map(&:url)
+        staged_sources = false
         available_platforms(podspec).each do |platform|
           linkage = @use_static_frameworks ? :static : :dynamic
           podfile = podfile_from_spec(platform, podspec, source_urls, linkage, @is_local)
@@ -129,11 +134,14 @@ module Pod
           xcarchives = Dir.glob(File.join(xcodebuild_out_dir, '**', '*.xcarchive')).map do |path|
             XCArchive.new(path, podspec)
           end
-          stage_platform_xcframework(platform, sandbox, podspec, xcarchives, xcodebuild_out_dir, stage_dir)
+          unless xcarchives.all?(&:empty?)
+            stage_platform_xcframework(platform, sandbox, podspec, xcarchives, xcodebuild_out_dir, stage_dir)
+            staged_sources = true
+          end
         end
         stage_additional_artifacts(podspec, stage_dir)
         zip_output_path = pack(stage_dir, @project_zips_dir, podspec.name)
-        binary_podspec = generate_binary_podspec(podspec, stage_dir, zip_output_path)
+        binary_podspec = generate_binary_podspec(podspec, stage_dir, zip_output_path, staged_sources)
         validate_binary_podspec(binary_podspec)
         UI.message "Binary pod for #{podspec.name} created successfully!".green
       rescue XcodeBuilder::BuildError => e
@@ -212,9 +220,9 @@ module Pod
         copy_license(podspec, stage_dir)
       end
 
-      def generate_binary_podspec(source_podspec, stage_dir, zip_output_path)
+      def generate_binary_podspec(source_podspec, stage_dir, zip_output_path, staged_sources)
         name = source_podspec.name
-        spec_generator = SpecGenerator.new(source_podspec, @artifact_repo_url, zip_output_path)
+        spec_generator = SpecGenerator.new(source_podspec, @artifact_repo_url, zip_output_path, staged_sources)
         available_platforms(source_podspec).each do |platform|
           type = type_from_platform(platform)
           sandbox = @sandbox_map[platform.name]

data/lib/cocoapods-pack/gem_version.rb

@@ -17,5 +17,5 @@
 #
 
 module CocoapodsPack
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/cocoapods-pack/spec_generator.rb

@@ -27,12 +27,13 @@ class SpecGenerator
                        vendored_libraries resource_bundles resources preserve_paths cocoapods_version swift_versions].freeze
   PLATFORM_ATTRIBUTES = %w[frameworks libraries requires_arc xcconfig pod_target_xcconfig user_target_xcconfig].freeze
 
-  attr_reader :podspec_path, :platforms, :artifact_repo_url
+  attr_reader :podspec_path, :platforms, :artifact_repo_url, :staged_sources
 
-  def initialize(source_podspec, artifact_repo_url, zip_output_path)
+  def initialize(source_podspec, artifact_repo_url, zip_output_path, staged_sources)
     @podspec_path = source_podspec
     @artifact_repo_url = artifact_repo_url
     @zip_output_path = zip_output_path
+    @staged_sources = staged_sources
     @platforms = []
   end
 
@@ -75,10 +76,12 @@ class SpecGenerator
   end
 
   def platform_spec_hash(platform_name, product_name, vendored_frameworks, vendored_libraries)
-    {
-      'vendored_frameworks' => ["#{platform_name}/#{product_name}"] + vendored_frameworks,
-      'vendored_libraries' => vendored_libraries
-    }
+    platform_hash = {}
+    platform_hash['vendored_frameworks'] ||= []
+    platform_hash['vendored_frameworks'] << "#{platform_name}/#{product_name}" if staged_sources
+    platform_hash['vendored_frameworks'] += vendored_frameworks
+    platform_hash['vendored_libraries'] = vendored_libraries
+    platform_hash
   end
 
   def platforms_sections

data/lib/cocoapods-pack/xcode_builder.rb

@@ -61,27 +61,27 @@ class XcodeBuilder
     user_interface.puts "\nBuilding #{target} for iOS...\n".yellow
     run(create_build_command(target, ios_sim_args, xcodebuild_args, :simulator))
     run(create_build_command(target, ios_device_args, xcodebuild_args, :device))
-    user_interface.puts 'iOS build successful.'.green << "\n\n"
+    user_interface.puts(+'iOS build successful.'.green << "\n\n")
   end
 
   def build_osx(target, xcodebuild_args)
     user_interface.puts "\nBuilding #{target} for macOS...\n".yellow
     run(create_build_command(target, macos_args, xcodebuild_args))
-    user_interface.puts 'macOS build successful.'.green << "\n\n"
+    user_interface.puts(+'macOS build successful.'.green << "\n\n")
   end
 
   def build_watchos(target, xcodebuild_args)
     user_interface.puts "\nBuilding #{target} for watchOS...\n".yellow
     run(create_build_command(target, watchos_sim_args, xcodebuild_args, :simulator))
     run(create_build_command(target, watchos_device_args, xcodebuild_args, :device))
-    user_interface.puts 'watchOS build successful.'.green << "\n\n"
+    user_interface.puts(+'watchOS build successful.'.green << "\n\n")
   end
 
   def build_tvos(target, xcodebuild_args)
     user_interface.puts "\nBuilding #{target} for tvOS...\n".yellow
     run(create_build_command(target, tvos_sim_args, xcodebuild_args, :simulator))
     run(create_build_command(target, tvos_device_args, xcodebuild_args, :device))
-    user_interface.puts 'tvOS build successful.'.green << "\n\n"
+    user_interface.puts(+'tvOS build successful.'.green << "\n\n")
   end
 
   def build_ios_settings(target, type)

data/spec/spec_generator_spec.rb

@@ -21,14 +21,14 @@ describe_with_private_methods SpecGenerator do
 
     it 'generates a ruby podspec' do
       artifact_repo_url = 'http://example.com/MySample.zip'
-      spec = SpecGenerator.new source_podspec, artifact_repo_url, temp_file
+      spec = SpecGenerator.new source_podspec, artifact_repo_url, temp_file, true
       expect(spec.generate_ruby_string).to eq(expected_output)
       expect(spec.generate.to_pretty_json).to eq(Pod::Specification.from_string(expected_output, 'name.podspec').to_pretty_json)
     end
 
     it 'works with multiple platforms' do
       source_podspec = source_spec
-      spec = SpecGenerator.new source_podspec, 'url/MySample.zip', temp_file
+      spec = SpecGenerator.new source_podspec, 'url/MySample.zip', temp_file, true
       spec.add_platform(Pod::Platform.new(:ios, '8.0'), 'MySample.xcframework')
       spec.add_platform(Pod::Platform.new(:osx), 'MySample.xcframework')
       spec.add_platform(Pod::Platform.new(:watchos, '3.0'), 'MySample.xcframework')
@@ -53,7 +53,7 @@ end
 
     it 'works with a single platform' do
       source_podspec = source_spec
-      spec = SpecGenerator.new source_podspec, 'url/MySample.zip', temp_file
+      spec = SpecGenerator.new source_podspec, 'url/MySample.zip', temp_file, true
       spec.add_platform(Pod::Platform.new(:ios), 'MySample.xcframework')
       expected_output = %(# Generated by cocoapods-pack #{CocoapodsPack::VERSION} - Do not manually modify.
 Pod::Spec.new do |s|
@@ -73,7 +73,7 @@ end
       source_podspec = source_spec(root: { dependencies: [Pod::Dependency.new('Dependency1', ['~> 1.0']),
                                                           Pod::Dependency.new('Dependency2', ['>= 0']),
                                                           Pod::Dependency.new('Dependency3', ['>= 0', '< 2.0'])] })
-      spec = SpecGenerator.new source_podspec, 'url/MySample.zip', temp_file
+      spec = SpecGenerator.new source_podspec, 'url/MySample.zip', temp_file, true
       expected_output = %(# Generated by cocoapods-pack #{CocoapodsPack::VERSION} - Do not manually modify.
 Pod::Spec.new do |s|
   s.name = 'MySample'
@@ -90,7 +90,7 @@ end
 
     it 'works with vendored_libraries' do
       source_podspec = source_spec(attributes_hash: { 'vendored_libraries' => ['lib1.a', 'lib2.a'] })
-      spec = SpecGenerator.new source_podspec, 'url/MySample.zip', temp_file
+      spec = SpecGenerator.new source_podspec, 'url/MySample.zip', temp_file, true
       expected_output = %(# Generated by cocoapods-pack #{CocoapodsPack::VERSION} - Do not manually modify.
 Pod::Spec.new do |s|
   s.name = 'MySample'
@@ -104,7 +104,7 @@ end
 
     it 'works with platform vendored_libraries' do
       source_podspec = source_spec(attributes_hash: { 'ios' => { 'vendored_libraries' => 'ioslib.a' } })
-      spec = SpecGenerator.new source_podspec, 'url/MySample.zip', temp_file
+      spec = SpecGenerator.new source_podspec, 'url/MySample.zip', temp_file, true
       spec.add_platform(Pod::Platform.new(:ios), 'MySample.xcframework')
       expected_output = %(# Generated by cocoapods-pack #{CocoapodsPack::VERSION} - Do not manually modify.
 Pod::Spec.new do |s|
@@ -123,7 +123,7 @@ end
 
     it 'works with vendored_frameworks' do
       source_podspec = source_spec(attributes_hash: { 'vendored_frameworks' => ['lib1.framework', 'lib2.framework'] })
-      spec = SpecGenerator.new source_podspec, 'url/MySample.zip', temp_file
+      spec = SpecGenerator.new source_podspec, 'url/MySample.zip', temp_file, true
       expected_output = %(# Generated by cocoapods-pack #{CocoapodsPack::VERSION} - Do not manually modify.
 Pod::Spec.new do |s|
   s.name = 'MySample'
@@ -137,7 +137,7 @@ end
 
     it 'works with platform vendored_frameworks' do
       source_podspec = source_spec(attributes_hash: { 'ios' => { 'vendored_frameworks' => 'ioslib.framework' } })
-      spec = SpecGenerator.new source_podspec, 'url/MySample.zip', temp_file
+      spec = SpecGenerator.new source_podspec, 'url/MySample.zip', temp_file, true
       spec.add_platform(Pod::Platform.new(:ios), 'MySample.xcframework')
       expected_output = %(# Generated by cocoapods-pack #{CocoapodsPack::VERSION} - Do not manually modify.
 Pod::Spec.new do |s|
@@ -155,7 +155,7 @@ end
 
     it 'works with glob paths' do
       source_podspec = source_spec(attributes_hash: { 'ios' => { 'vendored_libraries' => '*.a' } })
-      spec = SpecGenerator.new source_podspec, 'url/MySample.zip', temp_file
+      spec = SpecGenerator.new source_podspec, 'url/MySample.zip', temp_file, true
       spec.add_platform(Pod::Platform.new(:ios), 'MySample.xcframework')
       expected_output = %(# Generated by cocoapods-pack #{CocoapodsPack::VERSION} - Do not manually modify.
 Pod::Spec.new do |s|
@@ -174,7 +174,7 @@ end
 
     it 'works with resources' do
       source_podspec = source_spec(attributes_hash: { 'resources' => ['a.png'], 'preserve_paths' => ['script.sh', 'run.sh'] })
-      spec = SpecGenerator.new source_podspec, 'url/MySample.zip', temp_file
+      spec = SpecGenerator.new source_podspec, 'url/MySample.zip', temp_file, true
       expected_output = %(# Generated by cocoapods-pack #{CocoapodsPack::VERSION} - Do not manually modify.
 Pod::Spec.new do |s|
   s.name = 'MySample'
@@ -189,7 +189,7 @@ end
 
     xit 'works with module maps and static libraries' do
       source_podspec = source_spec(root: { module_map: 'module.modulemap' })
-      spec = SpecGenerator.new source_podspec, 'url/MySample.zip', temp_file
+      spec = SpecGenerator.new source_podspec, 'url/MySample.zip', temp_file, true
       spec.add_platform(Pod::Platform.new(:ios, '7.0'), 'MySample.xcframework')
       expected_output = %(# Generated by cocoapods-pack #{CocoapodsPack::VERSION} - Do not manually modify.
 Pod::Spec.new do |s|

metadata

@@ -1,23 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-pack
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Square Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: cocoapods
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,23 +59,17 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: cocoapods
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.10'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.10'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -100,20 +114,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 description: |
   A CocoaPods plugin that converts a given podspec into its binary version.
   For a given podspec, a zip file will be produced containing the binary representation of the original podspec sources.
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Converts a source podspec into its binary form.