cocoapods-fy-bin 0.0.3 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbd6a96a75872847c4d3ffa42076280cb90f67aa4cd2e74797f9d5a790868b16
-  data.tar.gz: 8eaf53a48a9b6b8a45a21af3882555e2be94ed0ceac822b70d3e3e13df83598c
+  metadata.gz: 0f997f5805fe2021dcdb957dc7c15c75bbfb42bc4181a3152bdeb2c2b1d2fa4a
+  data.tar.gz: 483058815c66ae0be5959a186a43360267fca942d55afc43a2a98556c303f49e
 SHA512:
-  metadata.gz: fd12f4edf60d61d00355766162b006e65b8860b3b0f62c40c9cbb09dece4ad9b20325425ceca2f87f35c7550e5f0cb5c1d7ba50f17def194e763f7b26af1c78d
-  data.tar.gz: bfc73167c0affefa93ed0be862b1cd913e8d75ecabf3a18057b1467bbc26344018fbefc1627c32828526bcf951369a0d054b473e6fbf6636c8986742a4a304d6
+  metadata.gz: 70fa4b07e016a67b21db0746ba02ed782da66a4167a281e3ce0443ec256a98564673932e9ca84f01e556c487d1dfea189d3e5c5382bb940c3af43e3c90ebcfad
+  data.tar.gz: 1af79a69601f69b34b5abb8521680f6db52d7d9cd62a14622d97de4b688ae53b2b37fc690215452494cd3025482943a18266194e16f9adec0f1ec3183eb8ddbc

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

@@ -30,7 +30,7 @@ module Pod
               ['--framework-output', '输出framework文件'],
               ['--no-zip', '不压缩静态库 为 zip'],
               ['--configuration', 'Build the specified configuration (e.g. Debug). Defaults to Release'],
-              ['--env', "该组件上传的环境 %w[dev debug_iphoneos release_iphoneos]"],
+              ['--env', "该组件上传的环境 %w[debug release]"],
               ['--archs', "需要二进制组件的架构"]
           ].concat(Pod::Command::Gen.options).concat(super).uniq
         end
@@ -40,7 +40,7 @@ module Pod
         ]
 
         def initialize(argv)
-          @env = argv.option('env') || 'dev'
+          @env = argv.option('env') || 'debug'
           CBin.config.set_configuration_env(@env)
           UI.warn "====== cocoapods-fy-bin #{CBin::VERSION} 版本 ======== \n "
           UI.warn "======  #{@env} 环境 ======== \n "

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

@@ -20,14 +20,14 @@ module Pod
               ['--no-zip', '不压缩静态 framework 为 zip'],
               ['--all-make', '对该组件的依赖库，全部制作为二进制组件'],
               ['--configuration', 'Build the specified configuration (e.g. Release ). Defaults to Debug'],
-              ['--env', "该组件上传的环境 %w[dev debug_iphoneos release_iphoneos]"],
+              ['--env', "该组件上传的环境 %w[debug release]"],
               ['--archs', "需要二进制组件的架构"]
           ].concat(Pod::Command::Gen.options).concat(super).uniq
         end
 
         def initialize(argv)
 
-          @env = argv.option('env') || 'dev'
+          @env = argv.option('env') || 'release'
           CBin.config.set_configuration_env(@env)
           @podspec = argv.shift_argument
           @specification = Specification.from_file(@podspec)

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

@@ -11,39 +11,37 @@ module CBin
 
     def template_hash
       {
-          'configuration_env' => { description: '编译环境', default: 'dev', selection: %w[dev debug_iphoneos release_iphoneos] },
-          'code_repo_url' => { description: '源码私有源 Git 地址', default: 'git@github.com:su350380433/example_spec_source.git' },
-          'binary_repo_url' => { description: '二进制私有源 Git 地址', default: 'git@github.com:su350380433/example_spec_bin_dev.git' },
-          'binary_download_url' => { description: '二进制下载地址，内部会依次传入组件名称与版本，替换字符串中的 %s ', default: 'http://localhost:8080/frameworks/%s/%s/zip' },
+          'configuration_env' => { description: '编译环境', default: 'debug', 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] }
       }
     end
 
     def config_file_with_configuration_env(configuration_env)
-      file = config_dev_file
-      if configuration_env == "release_iphoneos"
+      file = config_debug_iphoneos_file
+      if configuration_env == "release"
         file = config_release_iphoneos_file
         puts "\n======  #{configuration_env} 环境 ========"
-      elsif configuration_env == "debug_iphoneos"
+      elsif configuration_env == "debug"
         file = config_debug_iphoneos_file
         puts "\n======  #{configuration_env} 环境 ========"
-      elsif configuration_env == "dev"
-        puts "\n======  #{configuration_env} 环境 ========"
       else
-        raise "\n=====  #{configuration_env} 参数有误，请检查%w[dev debug_iphoneos release_iphoneos]===="
+        raise "\n=====  #{configuration_env} 参数有误，请检查%w[debug release]===="
       end
 
       File.expand_path("#{Pod::Config.instance.home_dir}/#{file}")
     end
 
     def configuration_env
-      #如果是dev 再去 podfile的配置文件中获取，确保是正确的， pod update时会用到
-      if @configuration_env == "dev" || @configuration_env == nil
+      #如果是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 ||= "dev"
+        configuration_env ||= "debug"
         @configuration_env = configuration_env
       end
       @configuration_env
@@ -51,8 +49,7 @@ module CBin
 
     #上传的url
     def binary_upload_url
-      cut_string = "/%s/%s/zip"
-      binary_download_url[0,binary_download_url.length - cut_string.length]
+      binary_download_url
     end
 
     def set_configuration_env(env)
@@ -61,15 +58,11 @@ module CBin
 
     #包含arm64  armv7架构，xcodebuild 是Debug模式
     def config_debug_iphoneos_file
-      "bin_debug_iphoneos.yml"
+      "bin_debug.yml"
     end
     #包含arm64  armv7架构，xcodebuild 是Release模式
     def config_release_iphoneos_file
-      "bin_release_iphoneos.yml"
-    end
-    #包含x86 arm64  armv7架构，xcodebuild 是Release模式
-    def config_dev_file
-      "bin_dev.yml"
+      "bin_release.yml"
     end
 
     def sync_config(config)

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

@@ -42,7 +42,7 @@ module CBin
 
           开始设置二进制化初始信息.
           所有的信息都会保存在 #{CBin.config.config_file} 文件中.
-          %w[bin_dev.yml bin_debug_iphoneos.yml bin_release_iphoneos.yml] 
+          %w[bin_debug.yml bin_release.yml]
           你可以在对应目录下手动添加编辑该文件. 文件包含的配置信息样式如下：
 
           #{CBin.config.default_config.to_yaml}

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

@@ -79,7 +79,8 @@ module CBin
       end
 
       def framework_zip_file(spec)
-        File.join(zip_dir_name, framework_name_version(spec))
+        # File.join(zip_dir_name, framework_name_version(spec))
+        File.join(zip_dir_name, "file.zip")
       end
 
       def framework_file(spec)

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

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

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

@@ -90,7 +90,7 @@ module CBin
 
       def zip_static_library
         Dir.chdir(zip_dir) do
-          output_library = "#{library_name}.zip"
+          output_library = "file.zip"
           unless File.exist?(library_name)
             raise Informative, "没有需要压缩的 library 文件：#{library_name}"
           end
@@ -111,7 +111,7 @@ module CBin
           FileUtils.rm_rf(framework_name) if @zip
           FileUtils.rm_rf(library_name)
           FileUtils.rm_rf(framework_name) unless @framework_output
-          FileUtils.rm_rf("#{framework_name}.zip") unless @framework_output
+          FileUtils.rm_rf("file.zip") unless @framework_output
         end
       end
 
@@ -124,7 +124,8 @@ module CBin
       end
 
       def framework_name_zip
-        CBin::Config::Builder.instance.framework_name_version(@spec) + ".zip"
+        # CBin::Config::Builder.instance.framework_name_version(@spec) + ".zip"
+        "file.zip"
       end
 
       def library_name

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

@@ -167,7 +167,7 @@ module CBin
 
       def compile
         defines = "GCC_PREPROCESSOR_DEFINITIONS='$(inherited)'"
-        defines += ' '
+        defines += "  SWIFT_ACTIVE_COMPILATION_CONDITIONS='$(inherited)' "
         defines += @spec.consumer(@platform).compiler_flags.join(' ')
 
         options = ios_build_options
@@ -203,6 +203,7 @@ module CBin
 
         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"
+          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"
         end
@@ -295,31 +296,45 @@ module CBin
         if File.exist?(swift_module_map_dir)
           `ditto #{swift_module_map_dir} #{framework.swift_module_path}`
           # 解决module与class名称冲突问题
-          swift_module_dir_path = File.expand_path(framework.swift_module_path)
-
-          exclude_frameworks = ["Foundation","Swift","UIKit","_Concurrency"]
-          Dir.chdir(swift_module_dir_path) {
-            if File.exist?("./arm64.swiftinterface")
-              arr = IO.readlines("arm64.swiftinterface")
-              arr.map { |item|
-                if item.include?("import ")
-                  items = item.split(" ")
-                  item_last = items.last
-                  if !exclude_frameworks.include?(item_last)
-                    `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.Method/#{item_last}BDF\\.Method/g' {} \\;`
-                    `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.#{item_last}/#{item_last}ACE\\.#{item_last}BDF/g' {} \\;`
-                    `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\./#{item_last}ACE\\./g' {} \\;`
-                    `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}ACE\\.//g' {} \\;`
-                    `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}BDF/#{item_last}/g' {} \\;`
-                    `find . -name "*.swiftinterface-e" | xargs rm -rf`
-                  end
-                end
-              }
-            end
-            # if File.exist?("./arm64-apple-ios.swiftinterface")
-              # arr = IO.readlines("arm64-apple-ios.swiftinterface")
-            # end
-          }
+          # swift_module_dir_path = File.expand_path(framework.swift_module_path)
+          #
+          # exclude_frameworks = ["Foundation","Swift","UIKit","_Concurrency"]
+          # Dir.chdir(swift_module_dir_path) {
+          #   if File.exist?("./arm64.swiftinterface")
+          #     arr = IO.readlines("arm64.swiftinterface")
+          #     arr.map { |item|
+          #       if item.include?("import ")
+          #         items = item.split(" ")
+          #         item_last = items.last
+          #         if !exclude_frameworks.include?(item_last)
+          #           `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.Method/#{item_last}BDF\\.Method/g' {} \\;`
+          #           `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.#{item_last}/#{item_last}ACE\\.#{item_last}BDF/g' {} \\;`
+          #           `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\./#{item_last}ACE\\./g' {} \\;`
+          #           `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}ACE\\.//g' {} \\;`
+          #           `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}BDF/#{item_last}/g' {} \\;`
+          #           `find . -name "*.swiftinterface-e" | xargs rm -rf`
+          #         end
+          #       end
+          #     }
+          #   end
+          #   if File.exist?("./arm64-apple-ios.swiftinterface")
+          #     arr = IO.readlines("arm64-apple-ios.swiftinterface")
+          #     arr.map { |item|
+          #       if item.include?("import ")
+          #         items = item.split(" ")
+          #         item_last = items.last
+          #         if !exclude_frameworks.include?(item_last)
+          #           `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.Method/#{item_last}BDF\\.Method/g' {} \\;`
+          #           `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.#{item_last}/#{item_last}ACE\\.#{item_last}BDF/g' {} \\;`
+          #           `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\./#{item_last}ACE\\./g' {} \\;`
+          #           `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}ACE\\.//g' {} \\;`
+          #           `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}BDF/#{item_last}/g' {} \\;`
+          #           `find . -name "*.swiftinterface-e" | xargs rm -rf`
+          #         end
+          #       end
+          #     }
+          #   end
+          # }
         end
       end
 

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

@@ -0,0 +1,44 @@
+require 'rest-client'
+
+module CBin
+  class Remote
+    class Helper
+      def initialize
+        @base_url = CBin.config.binary_upload_url
+      end
+
+      def exist?(name, version, tag)
+        uri = URI.join @base_url, "/frameworks/exit/#{name}/#{version}/#{tag}"
+        resp = RestClient.get(uri.to_s)
+        json = JSON.parse(resp.body)
+        json["data"]
+      end
+
+      def delete(name, version, tag)
+        uri = URI.join @base_url, "/frameworks/#{name}/#{version}/#{tag}"
+        resp = RestClient.delete uri.to_s
+        json = JSON.parse(resp.body)
+        json["status"]['code'] == 0
+      end
+
+      def upload(name, version, tag, file)
+        uri = URI.join @base_url, "/frameworks"
+        resp = RestClient.post(uri.to_s, {
+          file: File.new(file, 'rb'),
+          name: name,
+          version: version,
+          tag: tag
+        })
+        json = JSON.parse(resp.body)
+        @base_url + json["data"]['download_url']
+      end
+
+      def download_url(name, version, tag)
+        uri = URI.join @base_url, "/frameworks/#{name}/#{version}/#{tag}"
+        resp = RestClient.get uri.to_s
+        json = JSON.parse(resp.body)
+        @base_url + json["data"]['download_url']
+      end
+    end
+  end
+end

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

@@ -99,6 +99,7 @@ module CBin
         # spec_hash.delete('vendored_libraries')
         # libraries 只能假设为动态库不做处理了，如果有例外，需要开发者自行处理
         spec_hash.delete('vendored_libraries')
+        spec_hash.delete('vendored_library')
 
         # vendored_libraries = Array(vendored_libraries).reject { |l| l.end_with?('.a') }
         # if vendored_libraries.any?
@@ -186,7 +187,7 @@ module CBin
 
 
       def binary_source
-        { http: format(CBin.config.binary_download_url, code_spec.root.name, code_spec.version), type: CBin.config.download_file_type }
+        { http: "#{CBin.config.binary_download_url}/frameworks/download/#{code_spec.root.name}/#{code_spec.version}/#{CBin.config.configuration_env}/file.zip", type: CBin.config.download_file_type }
       end
 
       def code_spec_consumer(_platform = :ios)

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

@@ -9,6 +9,7 @@ require 'cocoapods-fy-bin/helpers/framework_builder'
 require 'cocoapods-fy-bin/helpers/library_builder'
 require 'cocoapods-fy-bin/helpers/sources_helper'
 require 'cocoapods-fy-bin/command/bin/spec/push'
+require 'cocoapods-fy-bin/helpers/remote_helper'
 
 module CBin
   class Upload
@@ -19,10 +20,11 @@ module CBin
         @spec = spec
         @code_dependencies = code_dependencies
         @sources = sources
+        @remote_helper = CBin::Remote::Helper.new
       end
 
       def upload
-        # curl_del_zip
+        del_zip
         Dir.chdir(CBin::Config::Builder.instance.root_dir) do
           # 创建binary-template.podsepc
           # 上传二进制文件
@@ -43,28 +45,29 @@ module CBin
         spec_creator.filename
       end
 
-      def curl_del_zip
+      # 如果存在相同的版本号先删除组件二进制
+      def del_zip
         print <<EOF
-          删除已上传的二进制文件
-         curl -v -X DELETE "#{CBin.config.binary_upload_url}/#{@spec.name}/#{@spec.version}"
+          删除已上传的二进制文件 #{@spec.name} #{@spec.version} #{CBin.config.configuration_env}
 EOF
-        `curl -v -X DELETE "#{CBin.config.binary_upload_url}/#{@spec.name}/#{@spec.version}"`
+        result = @remote_helper.exist?(@spec.name, @spec.version, CBin.config.configuration_env)
+        if result
+          print <<EOF
+          删除中
+EOF
+          @remote_helper.delete(@spec.name, @spec.version, CBin.config.configuration_env)
+        end
       end
+
       #推送二进制
-      # curl http://ci.xxx:9192/frameworks -F "name=IMYFoundation" -F "version=7.7.4.2" -F "annotate=IMYFoundation_7.7.4.2_log" -F "file=@bin_zip/bin_IMYFoundation_7.7.4.2.zip"
       def curl_zip
-        zip_file = "#{CBin::Config::Builder.instance.library_file(@spec)}.zip"
+        zip_file = CBin::Config::Builder.instance.framework_zip_file(@spec)
         res = File.exist?(zip_file)
-        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}"
+          上传二进制文件 #{@spec.name} #{@spec.version} #{CBin.config.configuration_env}
 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
+          @remote_helper.upload(@spec.name, @spec.version, CBin.config.configuration_env, zip_file) if res
         end
 
         res

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

@@ -28,11 +28,10 @@ module Pod
         set_internal_hash_value(USE_SOURCE_PODS, hash_pods_use_source)
       end
 
-      # 0 dev
-      # 1 debug_iphoneos
-      # 2 release_iphoneos
+      # 1 debug
+      # 2 release
       # 需要在podfile_env 先定义  CONFIGURATION_ENV
-      def set_configuration_env(env = "dev")
+      def set_configuration_env(env = "debug")
         set_internal_hash_value(CONFIGURATION_ENV, env)
       end
     end
@@ -66,7 +65,7 @@ module Pod
     end
 
     def configuration_env
-      get_internal_hash_value(CONFIGURATION_ENV, "dev") ||  ENV[CONFIGURATION_ENV] == "dev"
+      get_internal_hash_value(CONFIGURATION_ENV, "release") ||  ENV[CONFIGURATION_ENV] == "release"
     end
 
     private

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

@@ -8,8 +8,8 @@ Pod::HooksManager.register('cocoapods-fy-bin', :pre_install) do |_context, _|
   # pod bin repo update 更新二进制私有源
   Pod::Command::Bin::Repo::Update.new(CLAide::ARGV.new([])).run
 
-  # 有插件/本地库 且是dev环境下，默认进入源码白名单  过滤 archive命令
-  if _context.podfile.plugins.keys.include?('cocoapods-fy-bin') && _context.podfile.configuration_env == 'dev'
+  # 有插件/本地库 且是debug环境下，默认进入源码白名单  过滤 archive命令
+  if _context.podfile.plugins.keys.include?('cocoapods-fy-bin') && _context.podfile.configuration_env == 'debug'
     dependencies = _context.podfile.dependencies
     dependencies.each do |d|
       # 组件存在external_source，并且external_source有值 并且external_source path不为空 且不为archive状态时 设置组件加载路径

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-fy-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.6
 platform: ruby
 authors:
 - dr
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +132,7 @@ files:
 - lib/cocoapods-fy-bin/helpers/framework_builder.rb
 - lib/cocoapods-fy-bin/helpers/library.rb
 - lib/cocoapods-fy-bin/helpers/library_builder.rb
+- lib/cocoapods-fy-bin/helpers/remote_helper.rb
 - lib/cocoapods-fy-bin/helpers/sources_helper.rb
 - lib/cocoapods-fy-bin/helpers/spec_creator.rb
 - lib/cocoapods-fy-bin/helpers/spec_files_helper.rb