ty-cocoapods-packager 1.5.3 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e95ef8d1cb6e51d360b0059b5fd03006337091a568448b2a97b50853093ef6f
-  data.tar.gz: e8a22ff1425b5326e41493b9d015d1e405b5941894ff6651f1ea6dff1a40e2ef
+  metadata.gz: a43954a73334d19e5378c0e2e617f9da2729e0be24cf400a2f4d72e3a5a5b08b
+  data.tar.gz: 2ee22cea86d50ece060b81ae206a9736dfd1b149018f6f5cd69fcc81eec6ce31
 SHA512:
-  metadata.gz: af2e91ffeafc67aaf2e237e78d55f6da22f48e6593f3f122dedcc3f41dae34fea6481cc07569ac85515c8505c248003d4682bb3dc9d1a84fadd6fcd4a6b7bab6
-  data.tar.gz: '073596524c18d670b19df2a30eaa5ed2f12872933131380149aeddb66f9e0e7c268695450e3450dce9309c9cb1d371a6fb3f40d504fd8c65c10e4f378803239f'
+  metadata.gz: 3a49af92af69f6bc3ea4eea5707de4a762a3dc1a882a4c4c428a1057281010ef6d8a6d9e8994379efbe7b21e96386f5f4c6266d163708a21a334eb39d59aa37c
+  data.tar.gz: cc1e1d01cfcc06ac4148fe80360ea92cabe3e637b53d16b50354e12afcb4f1d615944b150812e6955742f652c60121c764ea1ed4928b845cd13cb47baf6cb8f4

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source 'https://gems.ruby-china.com'
 
 gemspec
 

data/Gemfile.lock

@@ -1,107 +1,137 @@
 PATH
   remote: .
   specs:
-    cocoapods-packager (1.5.0)
-      cocoapods (>= 1.1.1, < 2.0)
+    ty-cocoapods-packager (1.5.8)
+      cocoapods (>= 1.7.3, < 2.0)
 
 GEM
-  remote: https://rubygems.org/
+  remote: https://gems.ruby-china.com/
   specs:
-    activesupport (4.2.7.1)
+    CFPropertyList (3.0.2)
+    activesupport (4.2.11.3)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    ast (2.3.0)
+    algoliasearch (1.27.3)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    ast (2.4.1)
+    atomos (0.1.3)
     bacon (1.2.0)
-    claide (1.0.1)
-    cocoapods (1.1.1)
+    claide (1.0.3)
+    cocoapods (1.9.3)
       activesupport (>= 4.0.2, < 5)
-      claide (>= 1.0.1, < 2.0)
-      cocoapods-core (= 1.1.1)
-      cocoapods-deintegrate (>= 1.0.1, < 2.0)
-      cocoapods-downloader (>= 1.1.2, < 2.0)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.9.3)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.1.1, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
-      colored (~> 1.2)
+      colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (~> 2.0.1)
+      fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.1)
+      molinillo (~> 0.6.6)
       nap (~> 1.0)
-      xcodeproj (>= 1.3.3, < 2.0)
-    cocoapods-core (1.1.1)
-      activesupport (>= 4.0.2, < 5)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.14.0, < 2.0)
+    cocoapods-core (1.9.3)
+      activesupport (>= 4.0.2, < 6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.1)
-    cocoapods-downloader (1.1.2)
+      netrc (~> 0.11)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.4)
+    cocoapods-downloader (1.3.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
-    cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.1.1)
+    cocoapods-stats (1.1.0)
+    cocoapods-trunk (1.5.0)
       nap (>= 0.8, < 2.0)
-      netrc (= 0.7.8)
-    cocoapods-try (1.1.0)
-    colored (1.2)
-    coveralls (0.8.14)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
+    colored2 (3.1.2)
+    concurrent-ruby (1.1.6)
+    coveralls (0.8.23)
       json (>= 1.8, < 3)
-      simplecov (~> 0.12.0)
+      simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-      tins (~> 1.6.0)
-    docile (1.1.5)
+      thor (>= 0.19.4, < 2.0)
+      tins (~> 1.6)
+    docile (1.3.2)
     escape (0.0.4)
-    fourflusher (2.0.1)
+    ethon (0.12.0)
+      ffi (>= 1.3.0)
+    ffi (1.13.1)
+    fourflusher (2.3.1)
     fuzzy_match (2.0.4)
-    gh_inspector (1.0.2)
-    i18n (0.7.0)
-    json (1.8.3)
+    gh_inspector (1.1.3)
+    httpclient (2.8.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    json (2.3.0)
     metaclass (0.0.4)
-    minitest (5.9.1)
+    minitest (5.14.1)
     mocha (0.11.4)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.1)
       mocha (>= 0.9.8)
-    molinillo (0.5.2)
+    molinillo (0.6.6)
+    nanaimo (0.2.6)
     nap (1.1.0)
-    netrc (0.7.8)
-    parser (2.3.1.2)
-      ast (~> 2.2)
-    powerpack (0.1.1)
+    netrc (0.11.0)
+    parallel (1.19.1)
+    parser (2.7.1.3)
+      ast (~> 2.4.0)
     prettybacon (0.0.2)
       bacon (~> 1.2)
-    rainbow (2.1.0)
-    rake (11.2.2)
-    rubocop (0.41.2)
-      parser (>= 2.3.1.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
+    rubocop (0.85.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    simplecov (0.12.0)
-      docile (~> 1.1.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)
+    ruby-macho (1.4.0)
+    ruby-progressbar (1.10.1)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    term-ansicolor (1.3.2)
+    simplecov-html (0.10.2)
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tins (1.6.0)
-    tzinfo (1.2.2)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tins (1.25.0)
+      sync
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    unicode-display_width (1.1.0)
-    xcodeproj (1.3.3)
-      activesupport (>= 3)
-      claide (>= 1.0.1, < 2.0)
-      colored (~> 1.2)
+    unicode-display_width (1.7.0)
+    xcodeproj (1.16.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.2.6)
 
 PLATFORMS
   ruby
@@ -109,13 +139,13 @@ PLATFORMS
 DEPENDENCIES
   bacon
   bundler (~> 1.3)
-  cocoapods-packager!
   coveralls
   mocha (~> 0.11.4)
   mocha-on-bacon
   prettybacon
   rake
   rubocop
+  ty-cocoapods-packager!
 
 BUNDLED WITH
-   1.13.5
+   1.17.3

data/cocoapods-packager.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "cocoapods", '>= 1.1.1', '< 2.0'
+  spec.add_dependency "cocoapods", '>= 1.7.3', '< 2.0'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/cocoapods-packager/builder.rb

@@ -15,6 +15,8 @@ module Pod
     end
 
     def build(platform, library)
+      UI.puts `xcrun xcodebuild -version`
+
       if library
         build_static_library(platform)
       else
@@ -34,6 +36,7 @@ module Pod
 
       create_static_library(platform.name.to_s)
       copy_static_headers
+      copy_static_resources
     end
 
     def build_framework(platform)
@@ -76,6 +79,8 @@ module Pod
       clean_directory_for_dynamic_build
       if platform.name == :ios
         build_dynamic_framework_for_ios(platform, defines, output)
+      elsif platform.name == :watchos
+        raise 'not supported yet'
       else
         build_dynamic_framework_for_mac(platform, defines, output)
       end
@@ -86,6 +91,8 @@ module Pod
 
       if platform.name == :ios
         build_static_lib_for_ios(static_libs, defines, output)
+      elsif platform.name == :watchos
+        build_static_lib_for_watchos(static_libs, defines, output)
       else
         build_static_lib_for_mac(static_libs, output)
       end
@@ -129,6 +136,8 @@ module Pod
     def build_sim_libraries(platform, defines)
       if platform.name == :ios
         xcodebuild(defines, '-sdk iphonesimulator', 'build-sim')
+      elsif platform.name == :watchos
+        xcodebuild(defines, '-sdk watchsimulator', 'build-sim')
       end
     end
 
@@ -142,6 +151,10 @@ module Pod
       `lipo #{@static_sandbox_root}/build/package.a #{@static_sandbox_root}/build-sim/package.a -create -output #{output}`
     end
 
+    def build_static_lib_for_watchos(static_libs, _defines, output)
+      build_static_lib_for_ios(static_libs, _defines, output)
+    end
+
     def build_static_lib_for_mac(static_libs, output)
       return if static_libs.count == 0
       `libtool -static -o #{output} #{static_libs.join(' ')}`
@@ -150,7 +163,7 @@ module Pod
     def build_with_mangling(platform, options)
       UI.puts 'Mangling symbols'
       defines = Symbols.mangle_for_pod_dependencies(@spec.name, @static_sandbox_root)
-      defines << ' ' << @spec.consumer(platform).compiler_flags.join(' ')
+      defines << " OTHER_CFLAGS='"  << @spec.consumer(platform).compiler_flags.join(' ') << "'"
 
       UI.puts 'Building mangled framework'
       xcodebuild(defines, options)
@@ -168,7 +181,7 @@ module Pod
 
     def compile(platform)
       defines = "GCC_PREPROCESSOR_DEFINITIONS='$(inherited) PodsDummy_Pods_#{@spec.name}=PodsDummy_PodPackage_#{@spec.name}'"
-      defines << ' ' << @spec.consumer(platform).compiler_flags.join(' ')
+      defines << " OTHER_CFLAGS='"  << @spec.consumer(platform).compiler_flags.join(' ') << "'"
 
       if platform.name == :ios
         options = ios_build_options
@@ -196,6 +209,34 @@ module Pod
         each { |h| `ditto #{h} #{@fwk.headers_path}/Public/#{h.sub(headers_source_root, '')}` }
     end
 
+    def copy_static_resources
+      assets_path = _create_assets_dir
+      file_accessor = Sandbox::FileAccessor.new(Pathname.new("Pods/#{@spec.name}"), @spec.consumer(:ios))
+      spec_resource_bundles = file_accessor.resource_bundles
+      spec_resources = file_accessor.resources
+
+      spec_resource_bundles.map do |bundle, resources|
+        UI.puts("copy resource bundle #{bundle}.bundle to Assets")
+        bundle_path = "#{assets_path}/#{bundle}.bundle/"
+        `mkdir #{bundle_path}`
+
+        resources.map { |resource| `cp #{resource} #{bundle_path}` }
+      end
+
+      puts "copy #{spec_resources.count} resource(s) to Assets" if spec_resources.count != 0
+      spec_resources.map do |resource|
+        `cp #{resource} #{assets_path}`
+      end
+    end
+
+    def _create_assets_dir
+      assets_path = 'Assets'
+      return assets_path if File.exist?(assets_path)
+
+      `mkdir #{assets_path}`
+      assets_path
+    end
+
     def copy_headers
       headers_source_root = "#{@public_headers_root}/#{@spec.name}"
 
@@ -305,7 +346,7 @@ MAP
         args = "#{args} CODE_SIGN_IDENTITY=\"\" CODE_SIGNING_REQUIRED=NO"
       end
 
-      command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{config} -target #{target} -project #{project_root}/Pods.xcodeproj 2>&1"
+      command = "xcrun xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{config} -target #{target} -project #{project_root}/Pods.xcodeproj 2>&1"
       output = `#{command}`.lines.to_a
 
       if $?.exitstatus != 0

data/lib/cocoapods-packager/pod_utils.rb

@@ -100,9 +100,12 @@ module Pod
       end
 
       def spec_with_path(path)
-        return if path.nil? || !Pathname.new(path).exist?
+        return if path.nil?
+        path = Pathname.new(path)
+        path = Pathname.new(Dir.pwd).join(path) unless path.absolute?
+        return unless path.exist?
 
-        @path = path
+        @path = path.expand_path
 
         if Pathname.new(path).directory?
           help! path + ': is a directory.'
@@ -128,9 +131,17 @@ module Pod
         dynamic_sandbox
       end
 
-      def install_dynamic_pod(dynamic_sandbox, static_sandbox, static_installer)
+      # @param [Pod::Sandbox] dynamic_sandbox
+      #
+      # @param [Pod::Sandbox] static_sandbox
+      #
+      # @param [Pod::Installer] static_installer
+      #
+      # @param [Pod::Platform] platform
+      #
+      def install_dynamic_pod(dynamic_sandbox, static_sandbox, static_installer, platform)
         # 1 Create a dynamic target for only the spec pod.
-        dynamic_target = build_dynamic_target(dynamic_sandbox, static_installer)
+        dynamic_target = build_dynamic_target(dynamic_sandbox, static_installer, platform)
 
         # 2. Build a new xcodeproj in the dynamic_sandbox with only the spec pod as a target.
         project = prepare_pods_project(dynamic_sandbox, dynamic_target.name, static_installer)
@@ -141,31 +152,40 @@ module Pod
         # 4. Copy the supporting files for the dynamic framework from the static sandbox.
         copy_dynamic_supporting_files(static_sandbox, dynamic_target, dynamic_sandbox)
 
-        # 5. Update the file accecssors.
-        dynamic_target = update_file_accessors(dynamic_target, dynamic_sandbox)
-
         # 6. Create the file references.
         install_file_references(dynamic_sandbox, [dynamic_target], project)
 
         # 7. Install the target.
-        install_library(dynamic_sandbox, dynamic_target)
+        install_library(dynamic_sandbox, dynamic_target, project)
 
         # 9. Write the actual Xcodeproject to the dynamic sandbox.
         write_pod_project(project, dynamic_sandbox)
       end
 
-      def build_dynamic_target(dynamic_sandbox, static_installer)
+      # @param [Pod::Installer] static_installer
+      #
+      # @return [Pod::PodTarget]
+      #
+      def build_dynamic_target(dynamic_sandbox, static_installer, platform)
         spec_targets = static_installer.pod_targets.select do |target|
           target.name == @spec.name
         end
         static_target = spec_targets[0]
 
-        dynamic_target = Pod::PodTarget.new(static_target.specs, static_target.target_definitions, dynamic_sandbox)
-        dynamic_target.host_requires_frameworks = true
-        dynamic_target.user_build_configurations = static_target.user_build_configurations
+        file_accessors = create_file_accessors(static_target, dynamic_sandbox)
+
+        archs = []
+
+        dynamic_target = Pod::PodTarget.new(dynamic_sandbox, true, static_target.user_build_configurations, archs, platform, static_target.specs, static_target.target_definitions, file_accessors)
         dynamic_target
       end
 
+      # @param [Pod::Sandbox] dynamic_sandbox
+      #
+      # @param [String] spec_name
+      #
+      # @param [Pod::Installer] installer
+      #
       def prepare_pods_project(dynamic_sandbox, spec_name, installer)
         # Create a new pods project
         pods_project = Pod::Project.new(dynamic_sandbox.project_path)
@@ -181,7 +201,6 @@ module Pod
         was_absolute = dynamic_sandbox.local_path_was_absolute?(spec_name)
         pods_project.add_pod_group(spec_name, path, local, was_absolute)
 
-        dynamic_sandbox.project = pods_project
         pods_project
       end
 
@@ -195,16 +214,13 @@ module Pod
         support_dir.mkdir
       end
 
-      def update_file_accessors(dynamic_target, dynamic_sandbox)
-        pod_root = dynamic_sandbox.pod_dir(dynamic_target.root_spec.name)
+      def create_file_accessors(target, dynamic_sandbox)
+        pod_root = dynamic_sandbox.pod_dir(target.root_spec.name)
 
         path_list = Sandbox::PathList.new(pod_root)
-        file_accessors = dynamic_target.specs.map do |spec|
-          Sandbox::FileAccessor.new(path_list, spec.consumer(dynamic_target.platform))
+        target.specs.map do |spec|
+          Sandbox::FileAccessor.new(path_list, spec.consumer(target.platform))
         end
-
-        dynamic_target.file_accessors = file_accessors
-        dynamic_target
       end
 
       def install_file_references(dynamic_sandbox, pod_targets, pods_project)
@@ -212,22 +228,20 @@ module Pod
         installer.install!
       end
 
-      def install_library(dynamic_sandbox, dynamic_target)
+      def install_library(dynamic_sandbox, dynamic_target, project)
         return if dynamic_target.target_definitions.flat_map(&:dependencies).empty?
-        target_installer = Pod::Installer::Xcode::PodsProjectGenerator::PodTargetInstaller.new(dynamic_sandbox, dynamic_target)
-        target_installer.install!
+        target_installer = Pod::Installer::Xcode::PodsProjectGenerator::PodTargetInstaller.new(dynamic_sandbox, project, dynamic_target)
+        result = target_installer.install!
+        native_target = result.native_target
 
         # Installs System Frameworks
-        dynamic_target.file_accessors.each do |file_accessor|
-          file_accessor.spec_consumer.frameworks.each do |framework|
-            if dynamic_target.should_build?
-              dynamic_target.native_target.add_system_framework(framework)
+        if dynamic_target.should_build?
+          dynamic_target.file_accessors.each do |file_accessor|
+            file_accessor.spec_consumer.frameworks.each do |framework|
+              native_target.add_system_framework(framework)
             end
-          end
-
-          file_accessor.spec_consumer.libraries.each do |library|
-            if dynamic_target.should_build?
-              dynamic_target.native_target.add_system_library(library)
+            file_accessor.spec_consumer.libraries.each do |library|
+              native_target.add_system_library(library)
             end
           end
         end

data/lib/cocoapods-packager/symbols.rb

@@ -1,6 +1,6 @@
 module Symbols
   def symbols_from_library(library)
-    syms = `nm -gU #{library}`.split("\n")
+    syms = `nm -defined-only -extern-only #{library}`.split("\n")
     result = classes_from_symbols(syms)
     result += constants_from_symbols(syms)
     result += variables_from_symbols(syms)

data/lib/cocoapods_packager.rb

@@ -1,5 +1,5 @@
 module Pod
   module Packager
-    VERSION = '1.5.3'.freeze
+    VERSION = '1.5.9'.freeze
   end
 end

data/lib/pod/command/package.rb

@@ -57,7 +57,7 @@ module Pod
 
       def run
         if @path.nil? || @spec.nil?
-          help! 'Unable to find a podspec with path or name.'
+          help! "Unable to find a podspec with path or name `#{@name}`."
           return
         end
 
@@ -80,7 +80,7 @@ module Pod
 
         if @dynamic
           dynamic_sandbox = build_dynamic_sandbox(static_sandbox, static_installer)
-          install_dynamic_pod(dynamic_sandbox, static_sandbox, static_installer)
+          install_dynamic_pod(dynamic_sandbox, static_sandbox, static_installer, platform)
         end
 
         begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ty-cocoapods-packager
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.9
 platform: ruby
 authors:
 - Kyle Fuller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -17,7 +17,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.7.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.7.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -155,8 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: CocoaPods plugin which allows you to generate a framework or static library