cocoapods-aomi-bin 0.0.2 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a2fc6b5b095570dddec6fe7ae36250adfaf03cfd232a2cd0cd872e9d95fd047
-  data.tar.gz: 286dedaef6a35e1a124b4558236ea3597297c740ba467bdf5909abbfa081434a
+  metadata.gz: b7481159dec769eae8103bda57cb36e305af85b987f1ef0599efe8d195d0d710
+  data.tar.gz: 51db4957eafd463de1746a986f66cf4e3e0c59dde020c16adfcff1facdf22b8e
 SHA512:
-  metadata.gz: 66663a4f6020566926e0a3c7d68b264dd51f632290277dcbddfdd121333b04e68cf6a1f847d1816324fe20e37e692d1c3700e203df17a4495752728ab94b33d0
-  data.tar.gz: c2826845e78a12982977eb3e9f65d3bcb778aa89039265d08e13e2cce9d0bca3f3feb232325c6b6baf355c5df25e10f026bb7ca19584d0a23a9be404e24e97a8
+  metadata.gz: 2ffb92c51c36a24ea08db92b8d6e17b30536bb273f726e0f6a93b1e94326f51c07dcf975199c38e0ae397825fe5fdf25ca18a848355ecea4cda9845adc8b52e5
+  data.tar.gz: 2efcd36bbb1c8103b9cc7da90f6b2aa69939bcd5fa4d63c418c0e3da1867abcaf3a9ea7df601223790a4bfdbb267368f8cfc4cd04356d1a02eefc3485e002909

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

@@ -6,8 +6,13 @@ require 'cocoapods-lhj-bin/command/bin/code'
 require 'cocoapods-lhj-bin/command/bin/update'
 require 'cocoapods-lhj-bin/command/bin/install'
 require 'cocoapods-lhj-bin/command/bin/import'
+require 'cocoapods-lhj-bin/command/bin/local'
 require 'cocoapods-lhj-bin/command/bin/lhj'
+require 'cocoapods-lhj-bin/command/bin/config/push'
+require 'cocoapods-lhj-bin/command/bin/oss/list'
+require 'cocoapods-lhj-bin/command/bin/oss/del'
 require 'cocoapods-lhj-bin/helpers'
+require 'cocoapods-lhj-bin/native'
 
 module Pod
   class Command
@@ -34,15 +39,12 @@ module Pod
 
       self.abstract_command = true
 
-      self.default_subcommand = 'open'
       self.summary = '组件二进制化插件.'
       self.description = <<-DESC
         组件二进制化插件。利用源码私有源与二进制私有源实现对组件依赖类型的切换。
       DESC
 
       def initialize(argv)
-        require 'cocoapods-lhj-bin/native'
-
         @help = argv.flag?('help')
         super
       end

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

@@ -43,7 +43,7 @@ module Pod
         def initialize(argv)
           @env = argv.option('env') || 'dev'
           CBin.config.set_configuration_env(@env)
-          UI.warn "====== cocoapods-lhj-bin #{CBin::VERSION} 版本 ======== \n "
+          UI.warn "====== cocoapods-aomi-bin #{CBin::VERSION} 版本 ======== \n "
           UI.warn "======  #{@env} 环境 ======== \n "
 
           @code_dependencies = argv.flag?('code-dependencies')
@@ -128,7 +128,7 @@ module Pod
                                                 @framework_output,
                                                 @zip,
                                                 @spec,
-                                                false ,
+                                                false,
                                                 @config)
               builder.build
             rescue Object => exception

data/lib/cocoapods-lhj-bin/command/bin/config/push.rb

@@ -0,0 +1,43 @@
+#coding:utf-8
+require 'cocoapods-lhj-bin/helpers/oss_helper'
+require 'yaml'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Init < Bin
+        class Push < Init
+          self.summary = '推送配置文档到OSS.'
+
+          def initialize(argv)
+            super
+          end
+
+          def run
+            push
+          end
+
+          def push
+            file = File.expand_path("#{Pod::Config.instance.home_dir}/bin_dev.yml")
+            CBin::OSS::Helper.instance.upload('bin_dev.yml', file)
+          end
+
+          def trans
+            key_map = {}
+            path = '/Users/lihaijian/workspace/cocoa/cocoapods-lhj-bin-build-temp/zh2Hant.properties'
+            File.open(path, 'r+') do |f|
+              f.each_line do |line|
+                arr = line.split('=')
+                key = [arr[0][2, 4].hex].pack("U")
+                val = arr[1].strip!
+                key_map[key] = [val[2, 4].hex].pack("U")
+              end
+            end
+            File.open('/Users/lihaijian/workspace/cocoa/cocoapods-lhj-bin-build-temp/zh2hant.yml', 'w') { |f| f.write key_map.to_yaml }
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+require 'csv'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Local < Bin
+        self.summary = '生成国际化文件'
+
+        def self.options
+          [
+            %w[--key Key在csv中第几列，默认为0],
+            %w[--cn 中文在csv中第几列，默认为1],
+            %w[--en 英文文在csv中第几列，默认为2]
+          ]
+        end
+
+        def initialize(argv)
+          @current_path = argv.shift_argument || Dir.pwd
+          @key_col = argv.option('key').to_i || 0
+          @cn_col = argv.option('cn').to_i || 1
+          @en_col = argv.option('en').to_i || 2
+          @key_map = {}
+          @trans_map = {}
+          @trans_map_invert = {}
+          super
+        end
+
+        def run
+          load_trans_map
+          read_csv_file
+          write_en_strings
+          write_zh_cn_strings
+          write_zh_hk_strings
+        end
+
+        def en_dir_name
+          'en.lproj'
+        end
+
+        def zh_hk_dir_name
+          'zh-hk.lproj'
+        end
+
+        def zh_cn_dir_name
+          'zh-cn.lproj'
+        end
+
+        def generate_file_name
+          'Localizable.strings'
+        end
+
+        def yaml_file
+          File.join(Pod::Config.instance.home_dir, 'zh2hant.yml')
+        end
+
+        def load_trans_map
+          require 'yaml'
+          down_load_yaml unless File.exist?(yaml_file)
+          contents = YAML.safe_load(File.open(yaml_file))
+          @trans_map = contents.to_hash
+          @trans_map_invert = @trans_map.invert
+        end
+
+        def down_load_yaml
+          require 'open-uri'
+          UI.puts "开始下载简繁配置文件...\n"
+          URI.open('http://aomi-ios-repo.oss-cn-shenzhen.aliyuncs.com/zh2hant.yml') do |i|
+            File.open(yaml_file, 'w+') do |f|
+              f.write(i.read)
+            end
+          end
+        end
+
+        def read_csv_file
+          Dir.glob("#{@current_path}/**/*.csv").each do |p|
+            CSV.foreach(p) { |row| @key_map[row[@key_col]] = { zh: row[@cn_col], en: row[@en_col] } unless row[0] =~ /[\u4e00-\u9fa5]/ }
+          end
+        end
+
+        def format_str(type, area = :cn)
+          str = ''
+          @key_map.each do |k, v|
+            val = v[type]
+            case area
+            when :hk
+              val = trans_zh_hk_str val
+            when :cn
+              val = trans_zh_cn_str val
+            end
+            str += "\"#{k}\" = \"#{val}\";\n"
+          end
+          str
+        end
+
+        def trans_zh_cn_str(input)
+          out = []
+          input.each_char do |c|
+            out << (@trans_map_invert[c] || c)
+          end
+          out.join('')
+        end
+
+        def trans_zh_hk_str(input)
+          out = []
+          input.each_char do |c|
+            out << (@trans_map[c] || c)
+          end
+          out.join('')
+        end
+
+        def write_to_file(file, contents)
+          FileUtils.rm_rf(file) if File.exist?(file)
+          FileUtils.mkdir_p(File.dirname(file)) unless File.exist?(File.dirname(file))
+          File.open(file, 'w+') do |f|
+            f.write(contents)
+          end
+        end
+
+        def generate_file(file, type)
+          content = format_str(type)
+          write_to_file(file, content)
+        end
+
+        def write_en_strings
+          file = File.join(@current_path, en_dir_name, generate_file_name)
+          generate_file(file, :en)
+        end
+
+        def write_zh_cn_strings
+          file = File.join(@current_path, zh_cn_dir_name, generate_file_name)
+          generate_file(file, :zh)
+        end
+
+        def write_zh_hk_strings
+          file = File.join(@current_path, zh_hk_dir_name, generate_file_name)
+          content = format_str(:zh, :hk)
+          write_to_file(file, content)
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-lhj-bin/command/bin/oss/del.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+require 'cocoapods-lhj-bin/helpers/oss_helper'
+
+module Pod
+  class Command
+    class Bin < Command
+      class OSS < Bin
+        class Del < OSS
+          self.summary = '删除OSS的key'
+
+          self.arguments = [
+            CLAide::Argument.new('--key=XX', true)
+          ]
+
+          def self.options
+            [
+              ['--key', 'OSS对应的key']
+            ]
+          end
+
+          def initialize(argv)
+            @key = argv.option('key')
+            super
+          end
+
+          def validate!
+            help! "请输入key" unless @key
+            super
+          end
+
+          def run
+            CBin::OSS::Helper.instance.delete(@key)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-lhj-bin/command/bin/oss/list.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+require 'cocoapods-lhj-bin/helpers/oss_helper'
+
+module Pod
+  class Command
+    class Bin < Command
+      class OSS < Bin
+        class List < OSS
+          self.summary = '查看OSS列表'
+
+          def initialize(argv)
+            super
+          end
+
+          def run
+            objects = CBin::OSS::Helper.instance.list
+            objects.each do |o|
+              path = "#{CBin::OSS::Helper.instance.url_path}/#{o.key}"
+              UI.puts path.green
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -121,7 +121,7 @@ module Pod
                       # 把本地和原始到dependencies 合并，设置dependencies
                       local_dependencies.each do |d|
                         UI.message "Development Pod #{d.to_yaml}"
-                        if podfile.plugins.keys.include?('cocoapods-lhj-bin')
+                        if podfile.plugins.keys.include?('cocoapods-aomi-bin')
                           podfile.set_use_source_pods(d.keys.first) if (d.is_a?(Hash) && d.keys.first)
                         end
                       end

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

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = '0.0.2'
+  VERSION = '0.0.7'
 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/oss_helper.rb

@@ -0,0 +1,35 @@
+require 'aliyun/oss'
+require 'cocoapods-lhj-bin/config/config'
+
+module CBin
+  class OSS
+    class Helper
+      def initialize
+        @client = Aliyun::OSS::Client.new(endpoint: CBin.config.oss_endpoint,
+                                          access_key_id: CBin.config.oss_access_key_id,
+                                          access_key_secret: CBin.config.oss_access_key_secret)
+        @bucket = @client.get_bucket(CBin.config.oss_bucket)
+      end
+
+      def url_path
+        "http://#{CBin.config.oss_bucket}.#{CBin.config.oss_endpoint}"
+      end
+
+      def upload(key, file)
+        @bucket.put_object(key, :file => file)
+      end
+
+      def list
+        @bucket.list_objects
+      end
+
+      def delete(key)
+        @bucket.delete_object(key)
+      end
+
+      def self.instance
+        @instance ||= new
+      end
+    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/helpers/upload_helper.rb

@@ -1,4 +1,4 @@
-require 'aliyun/oss'
+require 'cocoapods-lhj-bin/helpers/oss_helper'
 require 'cocoapods-lhj-bin/native/podfile'
 require 'cocoapods/command/gen'
 require 'cocoapods/generate'
@@ -17,8 +17,6 @@ module CBin
         @spec = spec
         @code_dependencies = code_dependencies
         @sources = sources
-        @client = Aliyun::OSS::Client.new(endpoint: CBin.config.oss_endpoint, access_key_id: CBin.config.oss_access_key_id, access_key_secret: CBin.config.oss_access_key_secret )
-        @bucket = @client.get_bucket(CBin.config.oss_bucket)
       end
 
       def upload
@@ -73,7 +71,7 @@ EOF
           res = File.exist?(zip_file)
         end
         if res
-          @bucket.put_object("#{@spec.name}/#{@spec.version}/#{@spec.name}.zip", :file => zip_file)
+          CBin::OSS::Helper.instance.upload("#{@spec.name}/#{@spec.version}/#{@spec.name}.zip", zip_file)
         end
         res
       end

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

@@ -72,8 +72,8 @@ module Pod
     private
 
     def valid_bin_plugin
-      unless plugins.keys.include?('cocoapods-lhj-bin')
-        raise Pod::Informative, 'You should add `plugin \'cocoapods-lhj-bin\'` before using its DSL'
+      unless plugins.keys.include?('cocoapods-aomi-bin')
+        raise Pod::Informative, 'You should add `plugin \'cocoapods-aomi-bin\'` before using its DSL'
       end
     end
 

data/lib/cocoapods-lhj-bin/native/podfile_env.rb

@@ -11,7 +11,7 @@ module Pod
 
     module ENVExecutor
       def execute_with_bin_plugin(&block)
-        execute_with_key(USE_PLUGINS, -> { 'cocoapods-lhj-bin' }, &block)
+        execute_with_key(USE_PLUGINS, -> { 'cocoapods-aomi-bin' }, &block)
       end
 
       def execute_with_allow_prerelease(allow_prerelease, &block)

data/lib/cocoapods-lhj-bin/native/resolver.rb

@@ -126,7 +126,7 @@ module Pod
             source = use_binary ? sources_manager.binary_source : sources_manager.code_source
 
             spec_version = rspec.spec.version
-            UI.message 'cocoapods-lhj-bin 插件'
+            UI.message 'cocoapods-aomi-bin 插件'
             UI.message "- 开始处理 #{rspec.spec.name} #{spec_version} 组件."
 
             begin

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

@@ -2,18 +2,18 @@ require 'cocoapods-lhj-bin/native/sources_manager'
 require 'cocoapods-lhj-bin/command/bin/repo/update'
 require 'cocoapods/user_interface'
 
-Pod::HooksManager.register('cocoapods-lhj-bin', :pre_install) do |_context, _|
+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 更新二进制私有源
     Pod::Command::Bin::Repo::Update.new(CLAide::ARGV.new([])).run
 
     # 有插件/本地库 且是dev环境下，默认进入源码白名单  过滤 archive命令
-    if _context.podfile.plugins.keys.include?('cocoapods-lhj-bin') && _context.podfile.configuration_env == 'dev'
+    if _context.podfile.plugins.keys.include?('cocoapods-aomi-bin') && _context.podfile.configuration_env == 'dev'
       dependencies = _context.podfile.dependencies
       dependencies.each do |d|
         next unless d.respond_to?(:external_source) &&
@@ -44,7 +44,7 @@ Pod::HooksManager.register('cocoapods-lhj-bin', :pre_install) do |_context, _|
   end
 end
 
-Pod::HooksManager.register('cocoapods-lhj-bin', :source_provider) do |context, _|
+Pod::HooksManager.register('cocoapods-aomi-bin', :source_provider) do |context, _|
   #pod bin update || install  不走这里
   if $ARGV[1] == 'update' || $ARGV[1] != 'install'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-aomi-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.7
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -42,16 +42,30 @@ dependencies:
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.20.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.20.1
+- !ruby/object:Gem::Dependency
+  name: aliyun-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +109,7 @@ files:
 - lib/cocoapods-lhj-bin/command/bin/archive.rb
 - lib/cocoapods-lhj-bin/command/bin/auto.rb
 - lib/cocoapods-lhj-bin/command/bin/code.rb
+- lib/cocoapods-lhj-bin/command/bin/config/push.rb
 - lib/cocoapods-lhj-bin/command/bin/dup.rb
 - lib/cocoapods-lhj-bin/command/bin/import.rb
 - lib/cocoapods-lhj-bin/command/bin/init.rb
@@ -102,6 +117,9 @@ files:
 - lib/cocoapods-lhj-bin/command/bin/install.rb
 - lib/cocoapods-lhj-bin/command/bin/lhj.rb
 - lib/cocoapods-lhj-bin/command/bin/lib/lint.rb
+- lib/cocoapods-lhj-bin/command/bin/local.rb
+- lib/cocoapods-lhj-bin/command/bin/oss/del.rb
+- lib/cocoapods-lhj-bin/command/bin/oss/list.rb
 - lib/cocoapods-lhj-bin/command/bin/repo/update.rb
 - lib/cocoapods-lhj-bin/command/bin/spec/create.rb
 - lib/cocoapods-lhj-bin/command/bin/spec/push.rb
@@ -120,6 +138,7 @@ files:
 - lib/cocoapods-lhj-bin/helpers/framework_builder.rb
 - lib/cocoapods-lhj-bin/helpers/library.rb
 - lib/cocoapods-lhj-bin/helpers/library_builder.rb
+- lib/cocoapods-lhj-bin/helpers/oss_helper.rb
 - lib/cocoapods-lhj-bin/helpers/sources_helper.rb
 - lib/cocoapods-lhj-bin/helpers/spec_creator.rb
 - lib/cocoapods-lhj-bin/helpers/spec_files_helper.rb