cocoapods-fy-bin 0.0.6 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f997f5805fe2021dcdb957dc7c15c75bbfb42bc4181a3152bdeb2c2b1d2fa4a
-  data.tar.gz: 483058815c66ae0be5959a186a43360267fca942d55afc43a2a98556c303f49e
+  metadata.gz: 349f56acd81d29471129eed2a459165a89fbd3b8558b118f9b531441bae5d8cc
+  data.tar.gz: 21b8eca394a490c8df72db1aed106272ad877065e18b6420da0a75e75edfc930
 SHA512:
-  metadata.gz: 70fa4b07e016a67b21db0746ba02ed782da66a4167a281e3ce0443ec256a98564673932e9ca84f01e556c487d1dfea189d3e5c5382bb940c3af43e3c90ebcfad
-  data.tar.gz: 1af79a69601f69b34b5abb8521680f6db52d7d9cd62a14622d97de4b688ae53b2b37fc690215452494cd3025482943a18266194e16f9adec0f1ec3183eb8ddbc
+  metadata.gz: 238a5aca517a885d3d08ac700c8af22607511e1c3dc7beb4d1f199b3afdaadec6e57d0974463f14db8f4e22ce88a6d3028179102ccbb77b8a6d68ceff4e992b2
+  data.tar.gz: ce69f0aa064cbac03c582852b1b667b69838d8042eb15a5b6fe3e4c3a06afb7165dfdc576853352086ace3ef29f5a4d62224336565440bee826004f5ee8b14c5

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

@@ -31,7 +31,8 @@ module Pod
               ['--no-zip', '不压缩静态库 为 zip'],
               ['--configuration', 'Build the specified configuration (e.g. Debug). Defaults to Release'],
               ['--env', "该组件上传的环境 %w[debug release]"],
-              ['--archs', "需要二进制组件的架构"]
+              ['--archs', "需要二进制组件的架构"],
+              ['--pre_build_shells', "xcodebuild前的脚本命令"]
           ].concat(Pod::Command::Gen.options).concat(super).uniq
         end
 
@@ -40,7 +41,7 @@ module Pod
         ]
 
         def initialize(argv)
-          @env = argv.option('env') || 'debug'
+          @env = argv.option('env') || 'release'
           CBin.config.set_configuration_env(@env)
           UI.warn "====== cocoapods-fy-bin #{CBin::VERSION} 版本 ======== \n "
           UI.warn "======  #{@env} 环境 ======== \n "
@@ -54,6 +55,7 @@ module Pod
           @sources = argv.option('sources') || []
           @platform = Platform.new(:ios)
           @archs = argv.option('archs', 'armv7,arm64')
+          @pre_build_shells = argv.option('pre_build_shells', '')
           @config = argv.option('configuration', 'Release')
 
           @framework_path
@@ -88,6 +90,7 @@ module Pod
                                             @zip,
                                             @spec,
                                             @archs,
+                                            @pre_build_shells,
                                             CBin::Config::Builder.instance.white_pod_list.include?(@spec.name),
                                             @config)
           builder.build

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

@@ -21,7 +21,8 @@ module Pod
               ['--all-make', '对该组件的依赖库，全部制作为二进制组件'],
               ['--configuration', 'Build the specified configuration (e.g. Release ). Defaults to Debug'],
               ['--env', "该组件上传的环境 %w[debug release]"],
-              ['--archs', "需要二进制组件的架构"]
+              ['--archs', "需要二进制组件的架构"],
+              ['--pre_build_shells', "xcodebuild前的脚本命令"]
           ].concat(Pod::Command::Gen.options).concat(super).uniq
         end
 
@@ -39,9 +40,11 @@ module Pod
           @all_make = argv.flag?('all-make', false)
           @verbose = argv.flag?('verbose', true)
           @archs = argv.flag?('archs', 'arm64')
+          @pre_build_shells = argv.flag?('pre_build_shells', '')
           @config = argv.option('configuration', 'Debug')
           @additional_args = argv.remainder!
 
+
           super
         end
 
@@ -125,6 +128,9 @@ module Pod
           if @archs
             argvs += ["--archs=#{@archs}"]
           end
+          if @pre_build_shells
+            argvs += ["--pre_build_shells=#{@pre_build_shells}"]
+          end
           argvs += ["--configuration=#{@config}"]
           
           archive = Pod::Command::Bin::Archive.new(CLAide::ARGV.new(argvs))

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

@@ -11,12 +11,13 @@ module CBin
 
     def template_hash
       {
-          'configuration_env' => { description: '编译环境', default: 'debug', selection: %w[debug release] },
+          'configuration_env' => { description: '编译环境', default: 'release', selection: %w[debug release] },
           'code_repo_url' => { description: '源码私有源 Git 地址', default: 'https://gitlab.fuyoukache.com/iosThird/swiftThird/FYSwiftSpecs.git' },
           'binary_repo_url' => { description: '二进制私有源 Git 地址', default: 'https://gitlab.fuyoukache.com/iosThird/swiftThird/fybinaryspecs.git' },
           'binary_download_url' => { description: '二进制下载主机地址，内部会依次传入组件名称、版本、打包模式', default: 'https://mobilepods.fuyoukache.com' },
           # 'binary_type' => { description: '二进制打包类型', default: 'framework', selection: %w[framework library] },
-          'download_file_type' => { description: '下载二进制文件类型', default: 'zip', selection: %w[zip tgz tar tbz txz dmg] }
+          'download_file_type' => { description: '下载二进制文件类型', default: 'zip', selection: %w[zip tgz tar tbz txz dmg] },
+          'clean_white_list' =>  { description: 'framework清空白名单, 二进制切换到源码会删除framework，避免这些库被删除重新下载', default: 'Bugly,LookinServer'}
       }
     end
 
@@ -37,12 +38,19 @@ module CBin
 
     def configuration_env
       #如果是debug 再去 podfile的配置文件中获取，确保是正确的， pod update时会用到
-      if @configuration_env == "debug" || @configuration_env == nil
-        if Pod::Config.instance.podfile
-          configuration_env ||= Pod::Config.instance.podfile.configuration_env
-        end
-        configuration_env ||= "debug"
-        @configuration_env = configuration_env
+      # if @configuration_env == "release" || @configuration_env == nil
+      #   if Pod::Config.instance.podfile
+      #     configuration_env ||= Pod::Config.instance.podfile.configuration_env
+      #   end
+      #   configuration_env ||= "release"
+      #   @configuration_env = configuration_env
+      # end
+      if @configuration_env == nil
+          if Pod::Config.instance.podfile
+            configuration_env ||= Pod::Config.instance.podfile.configuration_env
+          end
+          configuration_env ||= "release"
+          @configuration_env = configuration_env
       end
       @configuration_env
     end

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.0.6'
+  VERSION = '0.0.9'
 end
 
 module Pod

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

@@ -20,6 +20,7 @@ module CBin
                      zip,
                      rootSpec,
                      archs,
+                     pre_build_shells,
                      skip_archive = false,
                      build_model="Release")
         @spec = spec
@@ -28,6 +29,7 @@ module CBin
         @rootSpec = rootSpec
         @isRootSpec = rootSpec.name == spec.name
         @archs = archs
+        @pre_build_shells = pre_build_shells
         @skip_archive = skip_archive
         @framework_output = framework_output
         @zip = zip
@@ -56,7 +58,7 @@ module CBin
         source_dir = Dir.pwd
         file_accessor = Sandbox::FileAccessor.new(Pathname.new('.').expand_path, @spec.consumer(@platform))
         Dir.chdir(workspace_directory) do
-          builder = CBin::Framework::Builder.new(@spec, file_accessor, @platform, source_dir, @archs, @isRootSpec, @build_model)
+          builder = CBin::Framework::Builder.new(@spec, file_accessor, @platform, source_dir, @archs, @pre_build_shells, @isRootSpec, @build_model)
           @@build_defines = builder.build if @isRootSpec
           begin
             @framework_path = builder.lipo_build(@@build_defines) unless @skip_archive
@@ -70,7 +72,7 @@ module CBin
         source_dir = zip_dir
         file_accessor = Sandbox::FileAccessor.new(Pathname.new('.').expand_path, @spec.consumer(@platform))
         Dir.chdir(workspace_directory) do
-          builder = CBin::Library::Builder.new(@spec, file_accessor, @platform, source_dir , @archs, @framework_path)
+          builder = CBin::Library::Builder.new(@spec, file_accessor, @platform, source_dir , @archs, @pre_build_shells, @framework_path)
           builder.build
         end
       end

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

@@ -10,7 +10,7 @@ module CBin
     class Builder
       include Pod
 #Debug下还待完成
-      def initialize(spec, file_accessor, platform, source_dir, archs, isRootSpec = true, build_model="Debug")
+      def initialize(spec, file_accessor, platform, source_dir, archs, pre_build_shells, isRootSpec = true, build_model="Debug")
         @spec = spec
         @source_dir = source_dir
         @file_accessor = file_accessor
@@ -18,6 +18,7 @@ module CBin
         @build_model = build_model
         @isRootSpec = isRootSpec
         @archs = archs
+        @pre_build_commands = pre_build_shells
         #vendored_static_frameworks 只有 xx.framework  需要拼接为 xx.framework/xx by slj
         vendored_static_frameworks = file_accessor.vendored_static_frameworks.map do |framework|
           path = framework
@@ -74,6 +75,7 @@ module CBin
 
         # archs = %w[i386 x86_64]
         archs = ios_architectures_sim
+        pre_build_shell
         archs.map do |arch|
           xcodebuild(defines, "-sdk iphonesimulator ARCHS=\'#{arch}\' ", "build-#{arch}",@build_model)
         end
@@ -174,6 +176,7 @@ module CBin
         # if is_debug_model
           archs = ios_architectures
           # archs = %w[arm64 armv7 armv7s]
+          pre_build_shell
           archs.map do |arch|
             # -fembed-bitcode支持bitcode BUILD_LIBRARY_FOR_DISTRIBUTION=YES 构建向后兼容的framework
             xcodebuild(defines, "ARCHS=\'#{arch}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\' DEBUG_INFORMATION_FORMAT=\'dwarf-with-dsym\' BUILD_LIBRARY_FOR_DISTRIBUTION=YES","build-#{arch}",@build_model)
@@ -199,6 +202,27 @@ module CBin
         end
       end
 
+      # 编译前需执行的的shell脚本
+      def pre_build_shell
+        command_args = @pre_build_commands.split(",")
+        command_args.each do |command_arg|
+          command = "sh #{command_arg}"
+          puts command
+          UI.message "command = #{command}"
+          output = `#{command}`.lines.to_a
+
+          if $CHILD_STATUS.exitstatus != 0
+            raise <<~EOF
+            Shell command failed: #{command}
+            Output:
+            #{output.map { |line| "    #{line}" }.join}
+            EOF
+
+            Process.exit
+          end
+        end
+      end
+
       def xcodebuild(defines = '', args = '', build_dir = 'build', build_model = 'Debug')
 
         unless File.exist?("Pods.xcodeproj") #cocoapods-generate v2.0.0
@@ -206,6 +230,7 @@ module CBin
           puts command
         else
           command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{build_model} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
+          puts command
         end
 
         UI.message "command = #{command}"

data/lib/cocoapods-fy-bin/helpers/library_builder.rb

@@ -11,13 +11,14 @@ module CBin
     class Builder
       include Pod
 
-      def initialize(spec, file_accessor, platform, source_dir, archs, framework_path)
+      def initialize(spec, file_accessor, platform, source_dir, archs, pre_build_shells, framework_path)
         @spec = spec
         @source_dir = source_dir
         @file_accessor = file_accessor
         @platform = platform
         @framework = framework_path
         @archs = archs
+        @pre_build_shells = pre_build_shells
         @source_files = "#{@source_dir}/#{library.name_path}"
         @source_zip_file = "#{@source_files}.zip"
       end

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

@@ -122,7 +122,6 @@ 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-fy-bin @厦门美柚 - slj    」
           #{@spec.description}
         EOF
         @spec

data/lib/cocoapods-fy-bin/native/installer.rb

@@ -3,11 +3,17 @@ require 'parallel'
 require 'cocoapods'
 require 'xcodeproj'
 require 'cocoapods-fy-bin/native/pod_source_installer'
+require 'cocoapods-fy-bin/config/config'
 
 module Pod
   class Installer
     attr_reader :removed_frameworks
-    attr_reader :clean_white_list
+
+    def clean_white_list
+      clean_white_string = CBin.config.clean_white_list
+      clean_white = clean_white_string.split(",")
+      clean_white
+    end
 
     def cache_descriptors
       @cache_descriptors ||= begin
@@ -39,7 +45,6 @@ module Pod
 
     # 清除本地资源 /Users/dengrui/Library/Caches/CocoaPods/Pods/Release/
     def clean_pod_cache
-      clean_white_list = ['Bugly', 'LookinServer']
       podfile = Pod::Config.instance.podfile
       root_specs.sort_by(&:name).each do |spec|
         descriptors = cache_descriptors[spec.root.name]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-fy-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.9
 platform: ruby
 authors:
 - dr
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-05 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel