cocoapods-imy-bin 0.2.9.1 → 0.3.0.11

data/lib/cocoapods-imy-bin/helpers/spec_source_creator.rb

@@ -20,12 +20,12 @@ module CBin
       end
 
       def create
-        spec = create_from_code_spec
-
-        # Pod::UI.message '生成二进制 podspec 内容: '
-        # spec.to_pretty_json.split("\n").each do |text|
-          # Pod::UI.message text
-        # end
+        # spec = nil
+        if CBin::Build::Utils.is_framework(@code_spec)
+          spec = create_framework_from_code_spec
+        else
+          spec = create_from_code_spec
+        end
 
         spec
       end
@@ -121,12 +121,69 @@ module CBin
         @spec.vendored_libraries = binary_vendored_libraries
         @spec.resources = binary_resources if @spec.attributes_hash.keys.include?("resources")
         @spec.description = <<-EOF
-         「   converted automatically by plugin cocoapods-imy-bin @slj    」
+         「   converted automatically by plugin cocoapods-imy-bin @厦门美柚 - slj    」
+          #{@spec.description}
+        EOF
+        @spec
+      end
+
+      def create_framework_from_code_spec
+        @spec = code_spec.dup
+        # vendored_frameworks | resources | source | source_files | public_header_files
+        # license | resource_bundles | vendored_libraries
+
+        # Project Linkin
+        @spec.vendored_frameworks = "#{code_spec.root.name}.framework"
+
+        # Resources
+        extnames = []
+        extnames << '*.bundle' if code_spec_consumer.resource_bundles.any?
+        if code_spec_consumer.resources.any?
+          extnames += code_spec_consumer.resources.map { |r| File.basename(r) }
+        end
+        if extnames.any?
+          @spec.resources = framework_contents('Resources').flat_map { |r| extnames.map { |e| "#{r}/#{e}" } }
+        end
+
+        # Source Location
+        @spec.source = binary_source
+
+        # Source Code
+        # @spec.source_files = framework_contents('Headers/*')
+        # @spec.public_header_files = framework_contents('Headers/*')
+
+        # Unused for binary
+        spec_hash = @spec.to_hash
+        # spec_hash.delete('license')
+        spec_hash.delete('resource_bundles')
+        spec_hash.delete('exclude_files')
+        spec_hash.delete('preserve_paths')
+        # 这里不确定 vendored_libraries 指定的时动态/静态库
+        # 如果是静态库的话，需要移除，否则就不移除
+        # 最好是静态库都独立成 Pod ，cocoapods-package 打静态库去 collect 目标文件时好做过滤
+        # 这里统一只对命名后缀 .a 文件做处理
+        # spec_hash.delete('vendored_libraries')
+        # libraries 只能假设为动态库不做处理了，如果有例外，需要开发者自行处理
+        vendored_libraries = spec_hash.delete('vendored_libraries')
+        vendored_libraries = Array(vendored_libraries).reject { |l| l.end_with?('.a') }
+        if vendored_libraries.any?
+          spec_hash['vendored_libraries'] = vendored_libraries
+        end
+
+        # Filter platforms
+        platforms = spec_hash['platforms']
+        selected_platforms = platforms.select { |k, _v| @platforms.include?(k) }
+        spec_hash['platforms'] = selected_platforms.empty? ? platforms : selected_platforms
+
+        @spec = Pod::Specification.from_hash(spec_hash)
+        @spec.description = <<-EOF
+         「   converted automatically by plugin cocoapods-imy-bin @厦门美柚 - slj    」
           #{@spec.description}
-EOF
+        EOF
         @spec
       end
 
+
       def binary_source
         { http: format(CBin.config.binary_download_url, code_spec.root.name, code_spec.version), type: CBin.config.download_file_type }
       end

data/lib/cocoapods-imy-bin/helpers/upload_helper.rb

@@ -47,14 +47,19 @@ module CBin
       def curl_zip
         zip_file = "#{CBin::Config::Builder.instance.library_file(@spec)}.zip"
         res = File.exist?(zip_file)
-        print <<EOF
+        unless res
+          zip_file = CBin::Config::Builder.instance.framework_zip_file(@spec) + ".zip"
+          res = File.exist?(zip_file)
+        end
+        if res
+          print <<EOF
           上传二进制文件
          curl #{CBin.config.binary_upload_url} -F "name=#{@spec.name}" -F "version=#{@spec.version}" -F "annotate=#{@spec.name}_#{@spec.version}_log" -F "file=@#{zip_file}"
 EOF
-        `curl #{CBin.config.binary_upload_url} -F "name=#{@spec.name}" -F "version=#{@spec.version}" -F "annotate=#{@spec.name}_#{@spec.version}_log" -F "file=@#{zip_file}"` if res
+          `curl #{CBin.config.binary_upload_url} -F "name=#{@spec.name}" -F "version=#{@spec.version}" -F "annotate=#{@spec.name}_#{@spec.version}_log" -F "file=@#{zip_file}"` if res
+        end
 
         res
-
       end
 
 

data/lib/cocoapods-imy-bin/native.rb

@@ -16,4 +16,8 @@ if Pod.match_version?('~> 1.4')
   require 'cocoapods-imy-bin/native/acknowledgements'
   require 'cocoapods-imy-bin/native/sandbox_analyzer'
   require 'cocoapods-imy-bin/native/podspec_finder'
+  require 'cocoapods-imy-bin/native/file_accessor'
+  require 'cocoapods-imy-bin/native/pod_target_installer'
+  require 'cocoapods-imy-bin/native/target_validator'
+
 end

data/lib/cocoapods-imy-bin/native/analyzer.rb

@@ -48,6 +48,8 @@ module Pod
           old_update_repositories
         end
       end
+
+
     end
   end
 end

data/lib/cocoapods-imy-bin/native/file_accessor.rb

@@ -0,0 +1,28 @@
+require 'macho'
+require 'cocoapods'
+
+module Pod
+  class Sandbox
+    class FileAccessor
+
+      # swift动态库 需要设置为true
+     def dynamic_binary?(binary)
+       @cached_dynamic_binary_results ||= {}
+       return @cached_dynamic_binary_results[binary] unless @cached_dynamic_binary_results[binary].nil?
+       return false unless binary.file?
+
+       @cached_dynamic_binary_results[binary] = MachO.open(binary).dylib?
+     rescue MachO::MachOError
+       @cached_dynamic_binary_results[binary] = true
+
+     end
+
+     # def expanded_paths(patterns, options = {})
+     #   return [] if patterns.empty?
+     #    path_list.glob(patterns, options).flatten.compact.uniq
+     # end
+
+      #-----------------------------------------------------------------------#
+    end
+  end
+end

data/lib/cocoapods-imy-bin/native/pod_target_installer.rb

@@ -0,0 +1,94 @@
+module Pod
+  class Installer
+    class Xcode
+      class PodsProjectGenerator
+        # Creates the target for the Pods libraries in the Pods project and the
+        # relative support files.
+        #
+        class PodTargetInstaller < TargetInstaller
+          require 'cocoapods/installer/xcode/pods_project_generator/app_host_installer'
+
+          # Adds a shell script phase, intended only for library targets that contain swift,
+          # to copy the ObjC compatibility header (the -Swift.h file that the swift compiler generates)
+          # to the built products directory. Additionally, the script phase copies the module map, appending a `.Swift`
+          # submodule that references the (moved) compatibility header. Since the module map has been moved, the umbrella header
+          # is _also_ copied, so that it is sitting next to the module map. This is necessary for a successful archive build.
+          #
+          # @param  [PBXNativeTarget] native_target
+          #         the native target to add the Swift static library script phase into.
+          #
+          # @return [Void]
+          #
+          alias old_add_swift_library_compatibility_header_phase add_swift_library_compatibility_header_phase
+
+          def add_swift_library_compatibility_header_phase(native_target)
+            UI.warn("========= swift add_swift_library_compatibility_header_phase")
+            if $ARGV[1] == "auto"
+              UI.warn("========= auto swift add_swift_library_compatibility_header_phase")
+
+              if custom_module_map
+                raise Informative, 'Using Swift static libraries with custom module maps is currently not supported. ' \
+                                 "Please build `#{target.label}` as a framework or remove the custom module map."
+              end
+
+              build_phase = native_target.new_shell_script_build_phase('Copy generated compatibility header')
+
+              relative_module_map_path = target.module_map_path.relative_path_from(target.sandbox.root)
+              relative_umbrella_header_path = target.umbrella_header_path.relative_path_from(target.sandbox.root)
+
+              build_phase.shell_script = <<-SH.strip_heredoc
+              COMPATIBILITY_HEADER_PATH="${BUILT_PRODUCTS_DIR}/Swift Compatibility Header/${PRODUCT_MODULE_NAME}-Swift.h"
+              MODULE_MAP_PATH="${BUILT_PRODUCTS_DIR}/${PRODUCT_MODULE_NAME}.modulemap"
+
+              ditto "${DERIVED_SOURCES_DIR}/${PRODUCT_MODULE_NAME}-Swift.h" "${COMPATIBILITY_HEADER_PATH}"
+              ditto "${PODS_ROOT}/#{relative_module_map_path}" "${MODULE_MAP_PATH}"
+              ditto "${PODS_ROOT}/#{relative_umbrella_header_path}" "${BUILT_PRODUCTS_DIR}"
+              
+              COPY_PATH="${PODS_CONFIGURATION_BUILD_DIR}/${PRODUCT_MODULE_NAME}"
+              UMBRELLA_PATH="${BUILT_PRODUCTS_DIR}/${PRODUCT_MODULE_NAME}-umbrella.h"
+              SWIFTMODULE_PATH="${BUILT_PRODUCTS_DIR}/${PRODUCT_MODULE_NAME}.swiftmodule" 
+
+              ditto "${MODULE_MAP_PATH}" "${PODS_CONFIGURATION_BUILD_DIR}/${PRODUCT_MODULE_NAME}/${PRODUCT_MODULE_NAME}.modulemap"
+              ditto "${COMPATIBILITY_HEADER_PATH}" "${COPY_PATH}/Swift Compatibility Header/${PRODUCT_MODULE_NAME}-Swift.h"
+              ditto "${COMPATIBILITY_HEADER_PATH}" "${COPY_PATH}"
+              ditto "${UMBRELLA_PATH}" "${COPY_PATH}"
+              ditto "${SWIFTMODULE_PATH}" "${COPY_PATH}/${PRODUCT_MODULE_NAME}.swiftmodule"
+              ditto "${SWIFTMODULE_PATH}" "${COPY_PATH}/${PRODUCT_MODULE_NAME}.swiftmodule"
+              
+              if [ ${PRODUCT_MODULE_NAME} != ${PRODUCT_NAME} ] ; then
+                   ditto "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}-umbrella.h" "${COPY_PATH}"
+                   ditto "${COPY_PATH}" "${PODS_CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}"
+              fi
+    
+              MODULE_MAP_SEARCH_PATH = "${PODS_CONFIGURATION_BUILD_DIR}/${PRODUCT_MODULE_NAME}/${PRODUCT_MODULE_NAME}.modulemap"
+              
+              if [${MODULE_MAP_PATH} != ${MODULE_MAP_SEARCH_PATH}] ; then
+                  printf "\\n\\nmodule ${PRODUCT_MODULE_NAME}.Swift {\\n  header \\"${COPY_PATH}/Swift Compatibility Header/${PRODUCT_MODULE_NAME}-Swift.h\\"\\n  requires objc\\n}\\n" >> "${MODULE_MAP_SEARCH_PATH}"
+              fi
+
+              printf "\\n\\nmodule ${PRODUCT_MODULE_NAME}.Swift {\\n  header \\"${COMPATIBILITY_HEADER_PATH}\\"\\n  requires objc\\n}\\n" >> "${MODULE_MAP_PATH}"
+
+              SH
+              build_phase.input_paths = %W(
+              ${DERIVED_SOURCES_DIR}/${PRODUCT_MODULE_NAME}-Swift.h
+              ${PODS_ROOT}/#{relative_module_map_path}
+              ${PODS_ROOT}/#{relative_umbrella_header_path}
+              )
+              build_phase.output_paths = %W(
+              ${BUILT_PRODUCTS_DIR}/${PRODUCT_MODULE_NAME}.modulemap
+              ${BUILT_PRODUCTS_DIR}/#{relative_umbrella_header_path.basename}
+              ${BUILT_PRODUCTS_DIR}/Swift\ Compatibility\ Header/${PRODUCT_MODULE_NAME}-Swift.h
+            )
+            else
+              UI.warn("========= null swift add_swift_library_compatibility_header_phase")
+              old_add_swift_library_compatibility_header_phase(native_target)
+            end
+
+          end
+
+          #-----------------------------------------------------------------------#
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-imy-bin/native/podfile_generator.rb

@@ -126,6 +126,14 @@ module Pod
                   break
                 end
               end
+              # setting modular_headers_for
+              if(target_definition && target_definition.use_modular_headers_hash.values.any?)
+                target_definition.use_modular_headers_hash.values.each do |f|
+                  f.each { | pod_name|  self.set_use_modular_headers_for_pod(pod_name, true) }
+                end
+              end
+
+
               if target_definition
                 value = target_definition.to_hash['dependencies']
                 next if value.blank?
@@ -139,15 +147,16 @@ module Pod
                 old_value = self.to_hash['dependencies'].first
                 value << old_value unless (old_value == nil || value.include?(old_value))
 
-               set_hash_value(%w(dependencies).first, value)
+                set_hash_value(%w(dependencies).first, value)
 
                 value = target_definition.to_hash['configuration_pod_whitelist']
                 next if value.blank?
                 set_hash_value(%w(configuration_pod_whitelist).first, value)
 
-                # self.children = Array.new
+
               end
 
+
             end
 
           end

data/lib/cocoapods-imy-bin/native/target_validator.rb

@@ -0,0 +1,41 @@
+module Pod
+  class Installer
+    class Xcode
+      # The {Xcode::TargetValidator} ensures that the pod and aggregate target
+      # configuration is valid for installation.
+      #
+      class TargetValidator
+
+
+
+        def verify_swift_pods_have_module_dependencies
+          error_messages = []
+          pod_targets.each do |pod_target|
+            next unless pod_target.uses_swift?
+
+            non_module_dependencies = []
+            pod_target.dependent_targets.each do |dependent_target|
+              next if !dependent_target.should_build? || dependent_target.defines_module?
+              non_module_dependencies << dependent_target.name
+            end
+
+            next if non_module_dependencies.empty?
+
+            error_messages << "The Swift pod `#{pod_target.name}` depends upon #{non_module_dependencies.map { |d| "`#{d}`" }.to_sentence}, " \
+                              "which #{non_module_dependencies.count == 1 ? 'does' : 'do'} not define modules. " \
+                              'To opt into those targets generating module maps '\
+                              '(which is necessary to import them from Swift when building as static libraries), ' \
+                              'you may set `use_modular_headers!` globally in your Podfile, '\
+                              'or specify `:modular_headers => true` for particular dependencies.'
+          end
+          return false
+
+          # raise Informative, 'The following Swift pods cannot yet be integrated '\
+                             # "as static libraries:\n\n#{error_messages.join("\n\n")}"
+        end
+
+
+      end
+    end
+  end
+end

data/lib/cocoapods-imy-bin/native/validator.rb

@@ -14,44 +14,7 @@ module Pod
     # Perform analysis for a given spec (or subspec)
     #
     def perform_extensive_analysis(spec)
-      if spec.non_library_specification?
-        error('spec', "Validating a non library spec (`#{spec.name}`) is not supported.")
-        return false
-      end
-      validate_homepage(spec)
-      validate_screenshots(spec)
-      validate_social_media_url(spec)
-      validate_documentation_url(spec)
-      validate_source_url(spec)
-
-      platforms = platforms_to_lint(spec)
-
-      valid = platforms.send(fail_fast ? :all? : :each) do |platform|
-        UI.message "\n\n#{spec} - Analyzing on #{platform} platform.".green.reversed
-        @consumer = spec.consumer(platform)
-        setup_validation_environment
-        begin
-          create_app_project
-          # download_pod
-          # check_file_patterns
-          # install_pod
-          # validate_swift_version
-          # add_app_project_import
-          # validate_vendored_dynamic_frameworks
-          # build_pod
-          # test_pod unless skip_tests
-        ensure
-          tear_down_validation_environment
-        end
-        validated?
-      end
-      return false if fail_fast && !valid
-      perform_extensive_subspec_analysis(spec) unless @no_subspecs
-    rescue => e
-      message = e.to_s
-      message << "\n" << e.backtrace.join("\n") << "\n" if config.verbose?
-      error('unknown', "Encountered an unknown error (#{message}) during validation.")
-      false
+      return true
     end
 
     #覆盖

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-imy-bin
 version: !ruby/object:Gem::Version
-  version: 0.2.9.1
+  version: 0.3.0.11
 platform: ruby
 authors:
 - 苏良锦
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-18 00:00:00.000000000 Z
+date: 2020-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -113,7 +113,9 @@ files:
 - lib/cocoapods-imy-bin/config/config_hot_key_asker.rb
 - lib/cocoapods-imy-bin/gem_version.rb
 - lib/cocoapods-imy-bin/helpers.rb
+- lib/cocoapods-imy-bin/helpers/Info.plist
 - lib/cocoapods-imy-bin/helpers/build_helper.rb
+- lib/cocoapods-imy-bin/helpers/build_utils.rb
 - lib/cocoapods-imy-bin/helpers/framework.rb
 - lib/cocoapods-imy-bin/helpers/framework_builder.rb
 - lib/cocoapods-imy-bin/helpers/library.rb
@@ -131,11 +133,13 @@ files:
 - lib/cocoapods-imy-bin/native.rb
 - lib/cocoapods-imy-bin/native/acknowledgements.rb
 - lib/cocoapods-imy-bin/native/analyzer.rb
+- lib/cocoapods-imy-bin/native/file_accessor.rb
 - lib/cocoapods-imy-bin/native/installation_options.rb
 - lib/cocoapods-imy-bin/native/installer.rb
 - lib/cocoapods-imy-bin/native/linter.rb
 - lib/cocoapods-imy-bin/native/path_source.rb
 - lib/cocoapods-imy-bin/native/pod_source_installer.rb
+- lib/cocoapods-imy-bin/native/pod_target_installer.rb
 - lib/cocoapods-imy-bin/native/podfile.rb
 - lib/cocoapods-imy-bin/native/podfile_env.rb
 - lib/cocoapods-imy-bin/native/podfile_generator.rb
@@ -145,6 +149,7 @@ files:
 - lib/cocoapods-imy-bin/native/source.rb
 - lib/cocoapods-imy-bin/native/sources_manager.rb
 - lib/cocoapods-imy-bin/native/specification.rb
+- lib/cocoapods-imy-bin/native/target_validator.rb
 - lib/cocoapods-imy-bin/native/validator.rb
 - lib/cocoapods-imy-bin/source_provider_hook.rb
 - lib/cocoapods_plugin.rb
@@ -169,7 +174,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: cocoapods-imy-bin is a plugin which helps develpers switching pods between