cocoapods-bb-bin 0.1.3 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfa99d11781fa490e65319ac92df2deaaafb3e3699083f85902dc92c0c27356f
-  data.tar.gz: 20fce8c4f449fafbbf33eba9299339210345cc34cbe32f54719489f89a3ff96b
+  metadata.gz: 9a0b3904ae69693b6a4e16d57411ad5593eb0a1631a59481fc438dd608173c91
+  data.tar.gz: a6e88bbb26fe868817172d8bcfc695180833a2c56a456187e32f8b4fadb23b40
 SHA512:
-  metadata.gz: 763267a56441687a3f66ef7fabebdfaba1e6548c803a18385091708c5db46053237300b244dd21ba4c27d054b050f793ab40b18bff723fa4d7a2209ac6d4ea87
-  data.tar.gz: 79ea50813de7d687eef1e9acd95f21ce72b0dcdf18dde3116fb1c4610ac96d3fe2c1deec89964cd622442753f05cc7468e1f9feb4138db5e25951d25486448af
+  metadata.gz: 9850aca45f033aba865d7f5aaca8b266c9ab158b27073a08fc11f035227f6b1b83e50903c1672c8141f2f2ec53beaa8b47c61c759852f78ceca8a29e06d56e59
+  data.tar.gz: 27d5e05acad74ff8173460a507ddcba00c7d61f8eb00fac82e3ab8db10233a631485bee04f2186c72550c2dc2644c1a6ff44b263a899bf029a4515b5bc8005f0

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

@@ -165,8 +165,8 @@ module Pod
                   "--verbose",
                   *@additional_args
                 ]
-
-                if File.exist?(Pod::Config.instance.podfile_path)
+                podfile_path = Pod::Config.instance.podfile_path
+                if podfile_path && File.exist?(podfile_path)
                   argvs += ['--use-podfile']
                 end
 
@@ -175,7 +175,7 @@ module Pod
                 end
 
                 argvs << spec_file if spec_file
-                UI.puts "argvs:#{argvs}"
+                # UI.puts "argvs:#{argvs}"
                 gen = Pod::Command::Gen.new(CLAide::ARGV.new(argvs))
                 gen.validate!
                 gen.run

data/lib/cocoapods-bb-bin/command/bin/auto.rb

@@ -29,12 +29,10 @@ module Pod
           @help = argv.flag?('help', false )
           if @help
           else
-            puts "开始执行自动推送操作，"
-            podfile_path = link_podfile # 创建软链接
-  
             @env = argv.option('env') || 'dev'
             CBin.config.set_configuration_env(@env)
   
+            podfile_path = link_podfile # 创建软链接
             @podspec = argv.shift_argument || find_podspec
             @specification = Specification.from_file(@podspec)
   
@@ -133,7 +131,7 @@ module Pod
             argvs += ["--env=#{@env}"]
           end
           argvs += ["--configuration=#{@config}"]
-          puts "===auto argvs: #{argvs}"
+          # puts "===auto argvs: #{argvs}"
           archive = Pod::Command::Bin::Archive.new(CLAide::ARGV.new(argvs))
           archive.validate!
           sources_sepc = archive.run
@@ -190,7 +188,7 @@ module Pod
         def find_podspec
           name = nil
           Pathname.pwd.children.each do |child|
-            puts child
+            # puts child
             if File.file?(child)
               if child.extname == '.podspec'
                 name = File.basename(child)
@@ -200,6 +198,7 @@ module Pod
               end
             end
           end
+          raise Informative,  "podspec File no exist, please check" unless name
           return name
         end
 
@@ -221,6 +220,8 @@ module Pod
                     if filename == 'Podfile'
                       podfile_path = File.join(filepath,"#{filename}")
                       create_link(podfile_path, current_path)
+                      # pods_path = File.join(filepath,"Pods")
+                      # create_link(pods_path, current_path)
                       return podfile_path
                     end
                   end
@@ -232,14 +233,14 @@ module Pod
           podfile_path = File.join(current_path,"Example/Podfile")
           if File.file?(podfile_path)
             create_link(podfile_path, current_path)
+            # pods_path = File.join(current_path,"Example/Pods")
+            # create_link(pods_path, current_path)
           end
         end
 
         def create_link(source_file, dest_file)
-          if File.file?(source_file)
-            system("ln -s #{source_file} #{dest_file}")
-            UI.puts "创建软链接 source:#{source_file} link:#{dest_file}"
-          end
+          system("ln -s #{source_file} #{dest_file}")
+          UI.puts "create link source:#{source_file} dest:#{dest_file}"
         end
       end
     end

data/lib/cocoapods-bb-bin/config/config.rb

@@ -24,12 +24,12 @@ module CBin
       file = config_dev_file
       if configuration_env == "release_iphoneos"
         file = config_release_iphoneos_file
-        puts "\n======  #{configuration_env} 环境 ========"
+        # puts "\n======  #{configuration_env} 环境 ========"
       elsif configuration_env == "debug_iphoneos"
         file = config_debug_iphoneos_file
-        puts "\n======  #{configuration_env} 环境 ========"
+        # puts "\n======  #{configuration_env} 环境 ========"
       elsif configuration_env == "dev"
-        puts "\n======  #{configuration_env} 环境 ========"
+        # puts "\n======  #{configuration_env} 环境 ========"
       else
         raise "\n=====  #{configuration_env} 参数有误，请检查%w[dev debug_iphoneos release_iphoneos]===="
       end
@@ -94,7 +94,7 @@ module CBin
 
     def config
       @config ||= begin
-                    @config = OpenStruct.new load_config
+        @config = OpenStruct.new load_config
         validate!
         @config
       end
@@ -131,6 +131,4 @@ module CBin
   def self.config
     @config ||= Config.new
   end
-
-
 end

data/lib/cocoapods-bb-bin/config/config_builder.rb

@@ -20,17 +20,18 @@ module CBin
       def load_build_config
         @white_pod_list = []
         @ignore_git_list = []
+        @ignore_http_list = []
         project_root = Pod::Config.instance.project_root
         path = File.join(project_root.to_s, 'BinArchive.json')
 
         if File.exist?(path)
           config = JSON.parse(File.read(path))
           @white_pod_list = config['archive-white-pod-list']
-          UI.warn "====== archive-white-pod-list = #{@white_pod_list}" if @white_pod_list
+          UI.warn "====== white_pod_list = #{@white_pod_list}" if @white_pod_list
           @ignore_git_list = config['ignore-git-list']
           UI.warn "====== ignore_git_list = #{@ignore_git_list}" if @ignore_git_list
           @ignore_http_list = config['ignore-http-list']
-          UI.warn "====== ignore-http-list = #{@ignore-http-list}" if @ignore-http-list
+          UI.warn "====== ignore_http_list = #{@ignore_http_list}" if @ignore_http_list
           @xcode_build_name = config['xcode_build_path']
           @root_dir = config['root_dir'] unless config['root_dir'].nil?
         end
@@ -142,6 +143,10 @@ module CBin
 
       #编译target名，如 seeyou
       def target_name
+        podfile_path = Pod::Config.instance.podfile_path
+        unless podfile_path
+          return ""
+        end
         @target_name ||= begin
                            target_name_str =  Pod::Config.instance.podfile.root_target_definitions.first.children.first.to_s
                            target_name_str[5,target_name_str.length]

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.1.3'
+  VERSION = '0.1.7'
 end
 
 module Pod

data/lib/cocoapods-bb-bin/helpers/build_helper.rb

@@ -56,6 +56,7 @@ module CBin
             build_static_framework
             unless @skip_archive
               unless  CBin::Build::Utils.is_framework(@spec)
+                UI.puts "build static library"
                 build_static_library
                 zip_static_library
               else

data/lib/cocoapods-bb-bin/helpers/build_utils.rb

@@ -48,6 +48,10 @@ module CBin
 
       def Utils.uses_frameworks?
         uses_frameworks = false
+        podfile_path = Pod::Config.instance.podfile_path
+        unless podfile_path
+          return true
+        end
         Pod::Config.instance.podfile.target_definitions.each do |key,value|
           if key != "Pods"
             uses_frameworks = value.uses_frameworks?

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

@@ -10,9 +10,10 @@ module CBin
     attr_reader :swift_module_path
     attr_reader :fwk_path
 
-    def initialize(name, platform)
+    def initialize(name, platform, embedded=false)
       @name = name
       @platform = platform
+      @embedded = embedded
     end
 
     def make
@@ -79,6 +80,11 @@ module CBin
 
     def make_root
       @root_path = Pathname.new(@platform)
+
+      if @embedded
+        @root_path += Pathname.new(@name + '.embeddedframework')
+      end
+      
       @root_path.mkpath unless @root_path.exist?
     end
   end

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

@@ -42,10 +42,11 @@ module CBin
 
         UI.puts "framework lipo build"
 
-        if CBin::Build::Utils.is_swift_module(@spec) || !CBin::Build::Utils.uses_frameworks?
+        # if CBin::Build::Utils.is_swift_module(@spec) || !CBin::Build::Utils.uses_frameworks?
+        if CBin::Build::Utils.is_framework(@spec) # 默认生成framework为静态库.a
           UI.section("Building static Library #{@spec}") do
             # defines = compile
-            UI.puts "swift framework lipo build"
+            UI.puts "static framework lipo build"
             # build_sim_libraries(defines)
             output = framework.versions_path + Pathname.new(@spec.name)
 
@@ -185,7 +186,8 @@ module CBin
           archs = ios_architectures
           # archs = %w[arm64 armv7 armv7s]
           archs.map do |arch|
-            xcodebuild(defines, "ARCHS=\'#{arch}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'","build-#{arch}",@build_model)
+            xcodebuild(defines, "-sdk iphoneos ARCHS=\'#{arch}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'","build-#{arch}",@build_model)
+            # xcodebuild(defines, "-sdk iphoneos ARCHS=\'#{arch}\' ","build-#{arch}",@build_model)
           end
         # else
           # xcodebuild(defines,options)
@@ -208,12 +210,12 @@ module CBin
          end
       end
 
-      def xcodebuild(defines = '', args = '', build_dir = 'build', build_model = 'Debug')
-
+      def xcodebuild(defines = '', args = '', build_dir = 'build', build_model = 'Debug', configuration = 'Release')
+        
         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"
+          command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{File.join(File.expand_path("..", build_dir), File.basename(build_dir))} clean build -configuration #{configuration} -target #{target_name} -project ./Pods/Pods.xcodeproj 2>&1"
         else
-          command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{build_model} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
+          command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{configuration} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
         end
 
         UI.message "command = #{command}"
@@ -264,14 +266,33 @@ module CBin
             module_map = File.read(module_map_file)
           end
         elsif public_headers.map(&:basename).map(&:to_s).include?("#{@spec.name}-umbrella.h")
-          module_map = <<-MAP
-          framework module #{@spec.name} {
-            umbrella header "#{@spec.name}-umbrella.h"
-
-            export *
-            module * { export * }
-          }
-          MAP
+          archs = ios_architectures + ios_architectures_sim
+          swift_Compatibility_Header = "build-#{archs.first}/Swift\ Compatibility\ Header/#{@spec.name}-Swift.h"
+          # 策略：针对混编组件，modulemap写入-Swift.h by hm 21.11.15
+          if File.exist?(swift_Compatibility_Header) # swift或swift与oc混编工程
+            module_map = <<-MAP
+framework module #{@spec.name} {
+  umbrella header "#{@spec.name}-umbrella.h"
+
+  export *
+  module * { export * }
+}
+
+module #{@spec.name}.Swift {
+    header "#{@spec.name}-Swift.h"
+    requires objc
+}
+MAP
+          else
+            module_map = <<-MAP
+framework module #{@spec.name} {
+  umbrella header "#{@spec.name}-umbrella.h"
+
+  export *
+  module * { export * }
+}
+MAP
+          end
         end
 
         unless module_map.nil?
@@ -332,6 +353,8 @@ module CBin
         if bundles.count > 0
           UI.message "Copying bundle files #{bundles}"
           bundle_files = bundles.join(' ')
+          raise Informative,  "source resource bundle no exist #{bundle_files}" unless File.exist?(bundle_files)
+          UI.message "[build dir]Copying resources current_path:#{Dir.pwd} bundle_files:#{bundle_files} res_path:#{framework.resources_path}"
           `cp -rp #{bundle_files} #{framework.resources_path} 2>&1`
         end
 
@@ -343,7 +366,7 @@ module CBin
           end
           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}") # 去除重复赋值，有些资源放在pods/组件目录下
           real_source_dir = spec_source_dir
         end
 
@@ -362,8 +385,10 @@ module CBin
           resources.each do |source|
             escape_resource << Shellwords.join(source)
           end
-          UI.message "Copying resources #{escape_resource}"
-          `cp -rp #{escape_resource.join(' ')} #{framework.resources_path}`
+          bundle_files = escape_resource.join(' ')
+          raise Informative,  "source resource bundle no exist #{bundle_files}" unless File.exist?(bundle_files)
+          UI.message "[search dir]Copying resources current_path:#{Dir.pwd} bundle_files:#{bundle_files} res_path:#{framework.resources_path}"
+          `cp -rp #{bundle_files} #{framework.resources_path} 2>&1`
         end
       end
 

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

@@ -22,9 +22,10 @@ module Pod
       def podfile_for_spec(spec)
         generator = self
         dir = configuration.gen_dir_for_pod(spec.name)
+        project_name = configuration.project_name_for_spec(spec)
 
         Pod::Podfile.new do
-          project "#{spec.name}.xcodeproj"
+          project "#{project_name}.xcodeproj"
           workspace "#{spec.name}.xcworkspace"
 
           plugin 'cocoapods-generate'
@@ -34,7 +35,7 @@ module Pod
           generator.podfile_plugins.each do |name, options|
             plugin(*[name, options].compact)
           end
-
+          # Pod::UI::puts "====use_frameworks:#{generator.configuration.use_frameworks?}"
           use_frameworks!(generator.configuration.use_frameworks?)
 
           if (supported_swift_versions = generator.supported_swift_versions)
@@ -101,16 +102,20 @@ module Pod
 
 
           inhibit_all_warnings! if generator.inhibit_all_warnings?
-          use_modular_headers! if generator.use_modular_headers?
+          # use_modular_headers! if generator.use_modular_headers?
+          # podfile 配置 use_frameworks! :linkage => :static 支持modulemap by hm 21/10/19
+          # Pod::UI::puts "====use_frameworks_value:#{generator.use_frameworks_value}"
+          unless generator.use_frameworks_value
+            use_modular_headers! # 默认组件没有配置或者没有podfile，支持modulemap by hm 21/10/20
+          end
+          if generator.use_modular_headers? || generator.use_frameworks_value.to_s == '{:linkage=>:static}'
+            use_modular_headers!
+          end
 
           # This is the pod declaration for the local pod,
           # it will be inherited by the concrete target definitions below
-
           pod_options = generator.dependency_compilation_kwargs(spec.name)
           pod_options[:path] = spec.defined_in_file.relative_path_from(dir).to_s
-          # generator.configuration.podfile.dependencies[0].external_source
-
-
           { testspecs: test_specs, appspecs: app_specs }.each do |key, specs|
             pod_options[key] = specs.map { |s| s.name.sub(%r{^#{Regexp.escape spec.root.name}/}, '') }.sort unless specs.empty?
           end
@@ -196,4 +201,3 @@ module Pod
     end
   end
 end
-

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

@@ -6,7 +6,7 @@ Pod::HooksManager.register('cocoapods-bb-bin', :pre_install) do |_context, _|
   require 'cocoapods-bb-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-bb-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.7
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-18 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -62,6 +62,9 @@ dependencies:
   name: cocoapods-bb-xcframework
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -69,6 +72,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -190,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.30
 signing_key:
 specification_version: 4
 summary: cocoapods-bb-bin is a plugin which helps develpers switching pods between