cocoapods-tdf-bin 0.0.14 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d58cea5d61fb520ad758e073c7a48ae4aa12e671ddbd5a37d9986dd6a95bb48c
-  data.tar.gz: b624142d0d1188145253d0dae5a92b7ebfc8330ed473638f626d748f25bf4406
+  metadata.gz: e942896253a1d129115b23c8d16e0e8a48132ca908fd55c65418d8a5bc2eb852
+  data.tar.gz: f21420c824eccac318f510e969b2283e0dd84719dc4b2f119365c0ca4b402701
 SHA512:
-  metadata.gz: c60b46825ec13f889eeeee0082e5963fba468a7ad6f62bde80bf1d0277cb3a2505c30a8920e198082cb89c6827d25ef1ae2c18c0a07b196149c57d69fd78184e
-  data.tar.gz: de6cca9c41748e410a7b865ce4b90a5fbc2340b04dbf566abe17eeeaf0889e961ca87cb410681dc30f59bdfbd9447a375aea8bb7b0828f89710115e9ed1894c0
+  metadata.gz: 1e4ba88019303f1233cf55550f68b29393211c8f722c6e3de943d4c8f7049eb9f265d61f298de6e15397994a64f655ef71c74881dd2117b9e45b5cbc50b1174d
+  data.tar.gz: deb0038838eb9790bc855469bc738c589d5025592a411d4b6851b5db0f56f4f3958b6240706f4dc9df024d36edf325eaadcda28e4341167e04ec90f049b5615d

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

@@ -50,6 +50,7 @@ module Pod
           @additional_args = argv.remainder!
 
           Pod::Resolver.build_dependencies_only_build(@only_build)
+          Pod::Resolver.build_dependencies_bin(true)
 
           super
         end

data/lib/cocoapods-tdf-bin/command/bin/batch.rb

@@ -0,0 +1,51 @@
+require 'cocoapods-tdf-bin/native/podfile_env'
+require 'cocoapods-tdf-bin/native/podfile'
+require 'cocoapods-tdf-bin/helpers/string_helper'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Batch < Bin
+
+        self.summary = "批量操作本地依赖组件的 git 命令"
+        self.description = <<-DESC
+          用来批量操作通过 batch_pod_local 本地依赖的组件库，比如 pod bin batch pull, pod bin batch checkout master 等等；
+          操作的是是通过 batch_pod_local 依赖的本地组件
+        DESC
+
+        def self.options
+          [
+            ['pull', '本地库全部拉取'],
+            ['push', '本地库全部推送'],
+            ['chenckout {分支名}', '切换指定分支'],
+            ['chenckout -b {分支名}', '切出指定分支'],
+          ]
+        end
+
+        def initialize(argv)
+          @arguments = argv.arguments
+          super
+        end
+
+        def run
+          podfile = File.join(Pathname.pwd, "Podfile")
+          podfile_instance = Pod::Podfile.from_file(podfile)
+          podfile_instance.get_batch_local_pods.each_value do |value|
+            path = value[0][:path]
+            arg = @arguments.join(" ")
+            puts "============== #{path} 开始执行 git #{arg} 命令 ==============".blue
+            puts `git -C #{path} #{arg}`
+          end
+        end
+
+        def validate!
+          git = `which git`
+          if git.empty?
+            help! "没有安装 git 命令"
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -7,6 +7,7 @@ require 'cocoapods-tdf-bin/command/bin/code'
 require 'cocoapods-tdf-bin/command/bin/update'
 require 'cocoapods-tdf-bin/command/bin/install'
 require 'cocoapods-tdf-bin/command/bin/imy'
+require 'cocoapods-tdf-bin/command/bin/batch'
 
 require 'cocoapods-tdf-bin/helpers'
 

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.0.14'
+  VERSION = '0.0.18'
 end
 
 module Pod

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

@@ -258,8 +258,17 @@ module CBin
           resources.each do |source|
             escape_resource << Shellwords.join(source)
           end
-          UI.message "Copying resources #{escape_resource}"
-          `cp -rp #{escape_resource.join(' ')} #{resource_target_dir}`
+
+          escape_resource_str = escape_resource.join(' ')
+          escape_resource_arr = escape_resource_str.split(' ')
+
+          escape_resource_arr = escape_resource_arr.select do | source |
+            suffix = File.extname(source)
+            not expand_suffix(suffix)
+          end
+
+          UI.message "Copying resources #{escape_resource_arr}"
+          `cp -rp #{escape_resource_arr.join(' ')} #{resource_target_dir}`
         end
       end
 
@@ -269,6 +278,17 @@ module CBin
         end
       end
 
+      def expand_suffix(suffix)
+        case suffix
+        when '.storyboard'        then true
+        when '.xib'               then true
+        when '.xcdatamodel'       then true
+        when '.xcdatamodeld'      then true
+        when '.xcmappingmodel'    then true
+        else                      false
+        end
+      end
+
       def framework
         @framework ||= begin
                          framework = Framework.new(@spec.name, @platform.name.to_s)

data/lib/cocoapods-tdf-bin/helpers/spec_creator.rb

@@ -119,8 +119,6 @@ module CBin
 
         @spec.resources = binary_resources if @spec.attributes_hash.keys.include?("resources")
 
-
-
         @spec
       end
 
@@ -133,7 +131,7 @@ module CBin
       end
 
       def framework_contents(name)
-        ["#{code_spec.root.name}.framework", "#{code_spec.root.name}.framework/Versions/A"].map { |path| "#{path}/#{name}" }
+        ["#{code_spec.root.name}.framework"].map { |path| "#{path}/#{name}" }
       end
 
       def binary_source_files

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

@@ -140,8 +140,15 @@ module CBin
         if code_spec_consumer.resources.any?
           extnames += code_spec_consumer.resources.map { |r| File.basename(r) }
         end
+
+        extnames = extnames.select do | extname |
+          not expand_suffix(extname)
+        end
+
         if extnames.any?
-          @spec.resources = framework_contents('Resources').flat_map { |r| extnames.map { |e| "#{r}/#{e}" } }
+          resources = framework_contents('Resources').flat_map { |r| extnames.map { |e| "#{r}/#{e}" } }
+          resources << "#{code_spec.root.name}.framework/*.{storyboardc,nib,mom,momd,cdm}"
+          @spec.resources = resources
         end
 
         # Source Location
@@ -182,6 +189,16 @@ module CBin
         @spec
       end
 
+      def expand_suffix(suffix)
+        if suffix.end_with?('.storyboard') ||
+          suffix.end_with?('.xib') ||
+          suffix.end_with?('.xcdatamodel') ||
+          suffix.end_with?('.xcdatamodeld') ||
+          suffix.end_with?('.xcmappingmodel')
+          return true
+        end
+        false
+      end
 
       def binary_source
         { http: format(CBin.config.binary_download_url, code_spec.root.name, code_spec.version), type: CBin.config.download_file_type }
@@ -192,7 +209,6 @@ module CBin
       end
 
       def framework_contents(name)
-        # ["#{code_spec.root.name}.framework", "#{code_spec.root.name}.framework/Versions/A"].map { |path| "#{path}/#{name}" }
         ["#{code_spec.root.name}.framework"].map { |path| "#{path}/#{name}" }
       end
 

data/lib/cocoapods-tdf-bin/helpers/string_helper.rb

@@ -0,0 +1,30 @@
+class String
+  # colorization
+  def colorize(color_code)
+    "\e[#{color_code}m#{self}\e[0m"
+  end
+
+  def red
+    colorize(31)
+  end
+
+  def green
+    colorize(32)
+  end
+
+  def yellow
+    colorize(33)
+  end
+
+  def blue
+    colorize(34)
+  end
+
+  def pink
+    colorize(35)
+  end
+
+  def light_blue
+    colorize(36)
+  end
+end

data/lib/cocoapods-tdf-bin/native/configuration.rb

@@ -21,6 +21,7 @@ module Pod
       def use_frameworks_value
         {:linkage => :static}
       end
+
     end
   end
 end

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

@@ -12,6 +12,46 @@ module Pod
         set_internal_hash_value(ALLOW_PRERELEASE, true)
       end
 
+      def batch_pod_local(pods, path = "../../")
+        pod_hash = Hash.new
+        pods.each do |name|
+          pod_hash[name] =  [ :path => "#{path}#{name}" ]
+        end
+        if get_batch_local_pods.nil?
+          set_internal_hash_value(BATCH_POD_LOCAL, pod_hash)
+        else
+          set_internal_hash_value(BATCH_POD_LOCAL, get_internal_hash_value(BATCH_POD_LOCAL).merge(pod_hash))
+        end
+      end
+
+      def batch_pod_remote(pods, branch , group = 'ios')
+        pod_hash = Hash.new
+        pods.each do |name|
+          pod_hash[name] = [ :git => "git@git.2dfire.net:#{group}/#{name}.git", :branch => "#{branch}" ]
+        end
+        if get_batch_remote_pods.nil?
+          set_internal_hash_value(BATCH_POD_REMOTE, pod_hash)
+        else
+          set_internal_hash_value(BATCH_POD_REMOTE, get_internal_hash_value(BATCH_POD_REMOTE).merge(pod_hash))
+        end
+      end
+
+      def pod(name = nil, *requirements)
+        unless name
+          raise StandardError, 'A dependency requires a name.'
+        end
+
+        local_pod_hash = get_batch_local_pods
+        remote_pod_hash = get_batch_remote_pods
+        if remote_pod_hash != nil
+          requirements = remote_pod_hash[name].nil? ? requirements : remote_pod_hash[name];
+        end
+        if local_pod_hash != nil
+          requirements = local_pod_hash[name].nil? ? requirements : local_pod_hash[name];
+        end
+        current_target_definition.store_pod(name, *requirements)
+      end
+
       def use_binaries!(flag = true)
         set_internal_hash_value(USE_BINARIES, flag)
       end
@@ -61,6 +101,14 @@ module Pod
       get_internal_hash_value(USE_BINARIES, false) || ENV[USE_BINARIES] == 'true'
     end
 
+    def get_batch_local_pods
+      get_internal_hash_value(BATCH_POD_LOCAL)
+    end
+
+    def get_batch_remote_pods
+      get_internal_hash_value(BATCH_POD_REMOTE)
+    end
+
     def use_source_pods
       get_internal_hash_value(USE_SOURCE_PODS, []) + String(ENV[USE_SOURCE_PODS]).split('|').uniq
     end

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

@@ -8,6 +8,8 @@ module Pod
     ALLOW_PRERELEASE = 'allow_prerelease'
     USE_PLUGINS = 'use_plugins'
     CONFIGURATION_ENV = 'configuration_env'
+    BATCH_POD_LOCAL = 'batch_pod_local'
+    BATCH_POD_REMOTE = 'batch_pod_remote'
 
     module ENVExecutor
       def execute_with_bin_plugin(&block)

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

@@ -36,6 +36,7 @@ module Pod
           end
 
           use_frameworks!(generator.use_frameworks_value)
+          use_binaries!
 
           if (supported_swift_versions = generator.supported_swift_versions)
             supports_swift_versions(supported_swift_versions)

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

@@ -11,8 +11,12 @@ require 'cocoapods-tdf-bin/command/bin/archive'
 module Pod
   class Resolver
 
+    # 仅仅只是编译出产物，不上传
     @@build_dependencies_only_build = false
 
+    # 是否是在进行二进制打包处理，没有的话一些步奏需要省略掉
+    @@build_dependencies_bin = false
+
     if Pod.match_version?('~> 1.6')
       # 其实不用到 resolver_specs_by_target 再改 spec
       # 在这个方法里面，通过修改 dependency 的 source 应该也可以
@@ -97,6 +101,11 @@ module Pod
       def Resolver.build_dependencies_only_build(only_build)
         @@build_dependencies_only_build = only_build
       end
+
+      def Resolver.build_dependencies_bin(bin)
+        @@build_dependencies_bin = bin
+      end
+
     end
 
       # >= 1.4.0 才有 resolver_specs_by_target 以及 ResolverSpecification
@@ -138,8 +147,11 @@ module Pod
             source = use_binary ? sources_manager.binary_source : sources_manager.code_source
 
             spec_version = rspec.spec.version
-            UI.message 'cocoapods-tdf-bin 插件'
-            UI.message "- 开始处理 #{rspec.spec.name} #{spec_version} 组件."
+
+            if use_binary
+              UI.message 'cocoapods-tdf-bin 插件'
+              UI.message "- 开始处理 #{rspec.spec.name} #{spec_version} 组件."
+            end
 
             if @@build_dependencies_only_build
               missing_binary_specs << rspec.spec
@@ -163,12 +175,14 @@ module Pod
                                end
                 # used_by_only = rspec.respond_to?(:used_by_tests_only) ? rspec.used_by_tests_only : rspec.used_by_non_library_targets_only
                 # 组装新的 rspec ，替换原 rspec
-                rspec = if Pod.match_version?('~> 1.4.0')
-                          ResolverSpecification.new(specification, used_by_only)
-                        else
-                          ResolverSpecification.new(specification, used_by_only, source)
-                        end
-                UI.message "组装新的 rspec ，替换原 rspec #{rspec.root.name} #{spec_version} \r\n specification =#{specification} \r\n #{rspec} "
+                if rspec.source != false
+                  rspec = if Pod.match_version?('~> 1.4.0')
+                            ResolverSpecification.new(specification, used_by_only)
+                          else
+                            ResolverSpecification.new(specification, used_by_only, source)
+                          end
+                  UI.message "组装新的 rspec ，替换原 rspec #{rspec.root.name} #{spec_version} \r\n specification =#{specification} \r\n #{rspec} "
+                end
 
               rescue Pod::StandardError => e
                 # 没有从新的 source 找到对应版本组件，直接返回原 rspec
@@ -183,6 +197,10 @@ module Pod
           end.compact
         end
 
+        unless @@build_dependencies_bin
+          return specs_by_target
+        end
+
         if missing_binary_specs.any?
           missing_binary_specs.uniq.each do |spec|
             UI.message "【#{spec.name} | #{spec.version}】组件无对应二进制版本 , 将采用源码依赖."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdf-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.18
 platform: ruby
 authors:
 - gaijiaofan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -95,6 +95,7 @@ files:
 - lib/cocoapods-tdf-bin/command/bin.rb
 - lib/cocoapods-tdf-bin/command/bin/archive.rb
 - lib/cocoapods-tdf-bin/command/bin/auto.rb
+- lib/cocoapods-tdf-bin/command/bin/batch.rb
 - lib/cocoapods-tdf-bin/command/bin/code.rb
 - lib/cocoapods-tdf-bin/command/bin/imy.rb
 - lib/cocoapods-tdf-bin/command/bin/init.rb
@@ -123,6 +124,7 @@ files:
 - lib/cocoapods-tdf-bin/helpers/spec_creator.rb
 - lib/cocoapods-tdf-bin/helpers/spec_files_helper.rb
 - lib/cocoapods-tdf-bin/helpers/spec_source_creator.rb
+- lib/cocoapods-tdf-bin/helpers/string_helper.rb
 - lib/cocoapods-tdf-bin/helpers/upload_helper.rb
 - lib/cocoapods-tdf-bin/native.rb
 - lib/cocoapods-tdf-bin/native/acknowledgements.rb