cocoapods-aomi-bin 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8af5d3044e9965778f518f80e69358502e4ecf4417612f9da5c0ab36604c5e21
-  data.tar.gz: 997b0da2161569f4573bc94b9c24659b75fce85d4dbb81761ab6d1443a130b16
+  metadata.gz: 1d14370bf2f3988bd859f9d2233d69c5337228c5bc53b6f52fc0704e742be708
+  data.tar.gz: 7bca87b04e368930953f835d7063ec254c428b3e964dda7d956d3c60a2b546b2
 SHA512:
-  metadata.gz: ec36fc238aad4fffdcc12dfbf86bba8a13f0bc0aca74100464e5a90bbc2842ae79c3d306828d5892fee6c7b547b8381c3f045e7a9ddd7ae4fd6d731aebab6d9a
-  data.tar.gz: 5cabff1c2c1278afe0b4f9cdaaa056648b250e3584391827a7f0fd3b62bc2b86eb528910459492fd2f29d9a6d0156ae4dbf63f06c6d62150ee8f20c000dd0bb1
+  metadata.gz: 3c931018ac9a9ffe7c33de89924fc8384f5838dd5fe4e5a2374cebeceacb87716a85f526bd3e518b68a28377ffcee585a47ead26e716bdb7918c6305c79b7063
+  data.tar.gz: 40a94477c63616344e8f0343de22458e04fe5b7c916493baae7a2935f249875cfe52a31e4858a73c2338991b264b1ad977c90ce6d056b06a6acca565057d7976

data/lib/cocoapods-lhj-bin/command/bin/archive.rb

@@ -128,7 +128,7 @@ module Pod
                                                 @framework_output,
                                                 @zip,
                                                 @spec,
-                                                false ,
+                                                false,
                                                 @config)
               builder.build
             rescue Object => exception

data/lib/cocoapods-lhj-bin/gem_version.rb

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end
 
 module Pod

data/lib/cocoapods-lhj-bin/helpers/framework.rb

@@ -9,6 +9,7 @@ module CBin
     attr_reader :versions_path
     attr_reader :swift_module_path
     attr_reader :fwk_path
+    attr_reader :root_resources_path
 
     def initialize(name, platform)
       @name = name
@@ -77,6 +78,11 @@ module CBin
       @resources_path.mkpath unless @resources_path.exist?
     end
 
+    def make_root_resources
+      @root_resources_path = @fwk_path + Pathname.new('Resources')
+      @root_resources_path.mkpath unless @root_resources_path.exist?
+    end
+
     def make_root
       @root_path = Pathname.new(@platform)
       @root_path.mkpath unless @root_path.exist?

data/lib/cocoapods-lhj-bin/helpers/framework_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # copy from https://github.com/CocoaPods/cocoapods-packager
 
 require 'cocoapods-lhj-bin/helpers/framework'
@@ -11,7 +12,7 @@ module CBin
     class Builder
       include Pod
 #Debug下还待完成
-      def initialize(spec, file_accessor, platform, source_dir, isRootSpec = true, build_model="Debug")
+      def initialize(spec, file_accessor, platform, source_dir, isRootSpec = true, build_model='Debug')
         @spec = spec
         @source_dir = source_dir
         @file_accessor = file_accessor
@@ -22,9 +23,7 @@ module CBin
         vendored_static_frameworks = file_accessor.vendored_static_frameworks.map do |framework|
           path = framework
           extn = File.extname  path
-          if extn.downcase == '.framework'
-            path = File.join(path,File.basename(path, extn))
-          end
+          path = File.join(path,File.basename(path, extn)) if extn.downcase == '.framework'
           path
         end
 
@@ -42,9 +41,6 @@ module CBin
 
         # if CBin::Build::Utils.is_swift_module(@spec) || !CBin::Build::Utils.uses_frameworks?
         #   UI.section("Building static Library #{@spec}") do
-        #     # defines = compile
-        #
-        #     # build_sim_libraries(defines)
         #     output = framework.versions_path + Pathname.new(@spec.name)
         #
         #     build_static_library_for_ios(output)
@@ -58,9 +54,6 @@ module CBin
         # else
         #   begin
             UI.section("Building framework  #{@spec}") do
-              # defines = compile
-
-              # build_sim_libraries(defines)
               output = framework.fwk_path + Pathname.new(@spec.name)
 
               copy_static_framework_dir_for_ios
@@ -69,12 +62,6 @@ module CBin
 
               # copy_license
               copy_framework_resources
-
-              #cp_to_source_dir#
-
-            # rescue Object => exception
-            #   UI.puts exception
-            # end
           end
         # end
 
@@ -112,9 +99,7 @@ module CBin
 
       def static_libs_in_sandbox(build_dir = 'build')
         file = Dir.glob("#{build_dir}/lib#{target_name}.a")
-        unless file
-          UI.warn "file no find = #{build_dir}/lib#{target_name}.a"
-        end
+        UI.warn "file no find = #{build_dir}/lib#{target_name}.a" unless file
         file
       end
 
@@ -129,7 +114,7 @@ module CBin
           static_libs += static_libs_in_sandbox("build-#{arch}") + @vendored_libraries
         end
 
-        build_path = Pathname("build")
+        build_path = Pathname('build')
         build_path.mkpath unless build_path.exist?
 
         libs = (ios_architectures + ios_architectures_sim) .map do |arch|
@@ -158,19 +143,19 @@ module CBin
         #   iphone5,iphone5s以下的模拟器
         # >x86_64
         #   iphone6以上的模拟器
-        archs = %w[arm64 armv7]
+        %w[arm64 armv7]
         # archs = %w[x86_64 arm64 armv7s i386]
         # @vendored_libraries.each do |library|
         #   archs = `lipo -info #{library}`.split & archs
         # end
-        archs
+        
       end
 
       def ios_architectures_sim
 
-        archs = %w[x86_64]
-        # TODO 处理是否需要 i386
-        archs
+        %w[x86_64]
+        # TODO: 处理是否需要 i386
+        
       end
 
       def compile
@@ -193,7 +178,7 @@ module CBin
       end
 
       def is_debug_model
-        @build_model == "Debug"
+        @build_model == 'Debug'
       end
 
       def target_name
@@ -208,10 +193,10 @@ module CBin
 
       def xcodebuild(defines = '', args = '', build_dir = 'build', build_model = 'Debug')
 
-        unless File.exist?("Pods.xcodeproj") #cocoapods-generate v2.0.0
-          command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{File.join(File.expand_path("..", build_dir), File.basename(build_dir))} clean build -configuration #{build_model} -target #{target_name} -project ./Pods/Pods.xcodeproj 2>&1"
-        else
+        if File.exist?('Pods.xcodeproj')
           command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{build_model} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
+        else #cocoapods-generate v2.0.0
+          command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{File.join(File.expand_path('..', build_dir), File.basename(build_dir))} clean build -configuration #{build_model} -target #{target_name} -project ./Pods/Pods.xcodeproj 2>&1"
         end
 
         UI.message "command = #{command}"
@@ -230,14 +215,12 @@ module CBin
 
       def copy_headers
         #走 podsepc中的public_headers
-        public_headers = Array.new
+        public_headers = []
 
         #by slj 如果没有头文件，去 "Headers/Public"拿
         # if public_headers.empty?
         spec_header_dir = "./Headers/Public/#{@spec.name}"
-        unless File.exist?(spec_header_dir)
-          spec_header_dir = "./Pods/Headers/Public/#{@spec.name}"
-        end
+        spec_header_dir = "./Pods/Headers/Public/#{@spec.name}" unless File.exist?(spec_header_dir)
         raise "copy_headers #{spec_header_dir} no exist " unless File.exist?(spec_header_dir)
         Dir.chdir(spec_header_dir) do
           headers = Dir.glob('*.h')
@@ -258,9 +241,7 @@ module CBin
         # create a default 'module_map' one using it.
         if !@spec.module_map.nil?
           module_map_file = @file_accessor.module_map
-          if Pathname(module_map_file).exist?
-            module_map = File.read(module_map_file)
-          end
+          module_map = File.read(module_map_file) if Pathname(module_map_file).exist?
         elsif public_headers.map(&:basename).map(&:to_s).include?("#{@spec.name}-umbrella.h")
           module_map = <<-MAP
           framework module #{@spec.name} {
@@ -274,9 +255,7 @@ module CBin
 
         unless module_map.nil?
           UI.message "Writing module map #{module_map}"
-          unless framework.module_map_path.exist?
-            framework.module_map_path.mkpath
-          end
+          framework.module_map_path.mkpath unless framework.module_map_path.exist?
           File.write("#{framework.module_map_path}/module.modulemap", module_map)
 
           # unless framework.swift_module_path.exist?
@@ -286,20 +265,16 @@ module CBin
           archs = ios_architectures + ios_architectures_sim
           archs.map do |arch|
             swift_module = "build-#{arch}/#{@spec.name}.swiftmodule"
-            if File.directory?(swift_module)
-              FileUtils.cp_r("#{swift_module}/.", framework.swift_module_path)
-            end
+            FileUtils.cp_r("#{swift_module}/.", framework.swift_module_path) if File.directory?(swift_module)
           end
           swift_Compatibility_Header = "build-#{archs.first}/Swift\ Compatibility\ Header/#{@spec.name}-Swift.h"
           FileUtils.cp(swift_Compatibility_Header,framework.headers_path) if File.exist?(swift_Compatibility_Header)
-          info_plist_file = File.join(File.dirname(__FILE__),"info.plist")
+          info_plist_file = File.join(File.dirname(__FILE__),'info.plist')
           FileUtils.cp(info_plist_file,framework.fwk_path)
         end
       end
 
-      def copy_swift_header
-
-      end
+      def copy_swift_header; end
 
       def copy_license
         UI.message 'Copying license'
@@ -327,7 +302,7 @@ module CBin
           bundle_names.include?(bundle_name)
         end
 
-        if bundles.count > 0
+        if bundles.count.positive?
           UI.message "Copying bundle files #{bundles}"
           bundle_files = bundles.join(' ')
           `cp -rp #{bundle_files} #{framework.resources_path} 2>&1`
@@ -335,13 +310,11 @@ module CBin
 
         real_source_dir = @source_dir
         unless @isRootSpec
-          spec_source_dir = File.join(Dir.pwd,"#{@spec.name}")
-          unless File.exist?(spec_source_dir)
-            spec_source_dir = File.join(Dir.pwd,"Pods/#{@spec.name}")
-          end
+          spec_source_dir = File.join(Dir.pwd,@spec.name.to_s)
+          spec_source_dir = File.join(Dir.pwd,"Pods/#{@spec.name}") unless File.exist?(spec_source_dir)
           raise "copy_resources #{spec_source_dir} no exist " unless File.exist?(spec_source_dir)
 
-          spec_source_dir = File.join(Dir.pwd,"#{@spec.name}")
+          spec_source_dir = File.join(Dir.pwd,@spec.name.to_s)
           real_source_dir = spec_source_dir
         end
 
@@ -349,12 +322,12 @@ module CBin
           expand_paths(real_source_dir, spec.consumer(@platform).resources)
         end.compact.uniq
 
-        if resources.count == 0 && bundles.count == 0
+        if resources.count.zero? && bundles.count.zero?
           framework.delete_resources
           return
         end
 
-        if resources.count > 0
+        if resources.count.positive?
           #把 路径转义。 避免空格情况下拷贝失败
           escape_resource = []
           resources.each do |source|
@@ -385,7 +358,7 @@ module CBin
           static_libs += static_libs_in_sandbox("build-#{arch}") + @vendored_libraries
         end
 
-        build_path = Pathname("build")
+        build_path = Pathname('build')
         build_path.mkpath unless build_path.exist?
 
         libs = (ios_architectures + ios_architectures_sim) .map do |arch|
@@ -402,18 +375,14 @@ module CBin
         archs = ios_architectures + ios_architectures_sim
         framework_dir = "build-#{ios_architectures_sim.first}/#{@spec.name}.framework"
         framework_dir = "build-#{ios_architectures.first}/#{@spec.name}.framework" unless File.exist?(framework_dir)
-        unless File.exist?(framework_dir)
-          raise "#{framework_dir} path no exist"
-        end
+        raise "#{framework_dir} path no exist" unless File.exist?(framework_dir)
         File.join(Dir.pwd, "build-#{ios_architectures_sim.first}/#{@spec.name}.framework")
         FileUtils.cp_r(framework_dir, framework.root_path)
 
-        # todo 所有架构的swiftModule拷贝到 framework.swift_module_path
+        # TODO: 所有架构的swiftModule拷贝到 framework.swift_module_path
         archs.map do |arch|
           swift_module = "build-#{arch}/#{@spec.name}.framework/Modules/#{@spec.name}.swiftmodule"
-          if File.directory?(swift_module)
-            FileUtils.cp_r("#{swift_module}/.", framework.swift_module_path)
-          end
+          FileUtils.cp_r("#{swift_module}/.", framework.swift_module_path) if File.directory?(swift_module)
         end
 
         # 删除Versions 软链接
@@ -422,8 +391,14 @@ module CBin
 
       def copy_framework_resources
         resources = Dir.glob("#{framework.fwk_path + Pathname.new('Resources')}/*")
-        if resources.count == 0
-          framework.delete_resources
+        framework.delete_resources if resources.count.zero?
+
+        consumer = @spec.consumer(@platform)
+        if consumer.resource_bundles.keys.any?
+          consumer.resource_bundles.each_key do |bundle_name|
+            bundle_file = "build-arm64/#{bundle_name}.bundle"
+            `cp -fa #{bundle_file} #{framework.fwk_path.to_s}`
+          end
         end
       end
 

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

@@ -62,14 +62,16 @@ module CBin
         # @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}" } }
+        # extnames = []
+        # extnames << '*.bundle' if code_spec_consumer.resource_bundles.any?
+        if code_spec_consumer.resources.keys.any?
+          extnames = code_spec_consumer.resource_bundles.keys.map { |r| "#{code_spec.root.name}.framework/#{r}.bundle" }
+          @spec.resources = extnames
         end
+        # if extnames.any?
+          # @spec.resources = framework_contents('Resources').flat_map { |r| extnames.map { |e| "#{r}/#{e}" } }
+        #   @spec.resources = extnames
+        # end
 
         # Source Location
         @spec.source = binary_source
@@ -132,14 +134,18 @@ module CBin
         @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}" } }
+        # extnames = []
+        # extnames << '*.bundle' if code_spec_consumer.resource_bundles.any?
+        if code_spec_consumer.resource_bundles.keys.any?
+          extnames = code_spec_consumer.resource_bundles.keys.map { |r| "#{code_spec.root.name}.framework/#{r}.bundle" }
+          @spec.resources = extnames
         end
+        # 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

data/lib/cocoapods-lhj-bin/source_provider_hook.rb

@@ -6,7 +6,7 @@ Pod::HooksManager.register('cocoapods-aomi-bin', :pre_install) do |_context, _|
   require 'cocoapods-lhj-bin/native'
 
   #pod bin update || install  不走这里
-  if $ARGV[1] = 'update' || $ARGV[1] != 'install'
+  if $ARGV[1] == 'update' || $ARGV[1] == 'install'
 
   else
     # pod bin repo update 更新二进制私有源

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-aomi-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods