cocoapods-tdf-bin 0.0.17 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f577bfd3e7fcecd47e17b0e1bcbcde05f610607a643bb17108cf302ee3d380c
-  data.tar.gz: e716d34c5ffbd2dba9b565fbd62f6c84b4e5013278f3e1d0f46733ace03377ac
+  metadata.gz: bfea2311ea4e2995ab9b416f7b7dee4cabf04228255ac3412f41bedd31563fc6
+  data.tar.gz: f7b77c4dc7d711472080d13dab237e3c76c1415dab6631f7855bb90bf3e42330
 SHA512:
-  metadata.gz: 913994c6be4e81d2bc8a9678f288b2b9b3496d128a081cd174f0b2838bad714f4fc2dd4adbf2616f075e031c0e44566c04104faf7c3ec25dcf3c89e26873b58e
-  data.tar.gz: b74dcc1705407ada38305239078378f22b3a379e14a2065ebd6895a2f43608773c828fb427a0e55c67bf17fc35c824174004db3b6c3bb6eb1029742dab2e24d2
+  metadata.gz: 2b1d5866284cf17a891b61e775db54c84242d6631f1e545c4bff1674dee3aada2d7fb32c0e3dcb38721c8045ee1c2ff1d0c0b6a5f7e0e6596972f0b98f3eddb8
+  data.tar.gz: c27895d1a9a506f6bd6888939c8d13959158bb67f8b6f6964651e8e4d54cd78dc8c279cfa1e012a53668c8d70137caa79a81446d7c6a902e9f27aa2500b660c2

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

@@ -15,36 +15,140 @@ module Pod
 
         def self.options
           [
-            ['pull', '本地库全部拉取'],
-            ['push', '本地库全部推送'],
-            ['chenckout {分支名}', '切换指定分支'],
-            ['chenckout -b {分支名}', '切出指定分支'],
+            ['clone', '本地库全部 clone 到指定本地目录'],
+            ['done', '完成本地库，自动将本地的 local 依赖改为remote依赖'],
+            ['{ git 命令 }', '本地库全部执行 git 命令，比如 pod bin batch pull, pod bin batch checkout -b feature/***'],
           ]
         end
 
         def initialize(argv)
-          @arguments = argv.arguments
+          @arguments = argv.arguments.map
           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}`
+          if podfile_instance.get_batch_local_pods == nil
+            help! "没有本地依赖的组件"
+          end
+          if @arguments.size == 1 && @arguments[0] == "clone"
+            clone_all(podfile_instance)
+          elsif @arguments.size == 1 && @arguments[0] == "done"
+            done_all(podfile_instance)
+          else
+            run_git(podfile_instance)
           end
         end
 
         def validate!
+          if @arguments.size < 1
+            help! "命令参数不够"
+          end
           git = `which git`
           if git.empty?
             help! "没有安装 git 命令"
           end
         end
 
+        def clone_all(podfile_instance)
+          local_pods = podfile_instance.get_batch_local_pods
+          local_pods.each_key do |name|
+            path = local_pods[name][0][:path]
+            repo_url = find_repo_with_pod(name)
+            puts "============== #{name} 开始 clone 到 #{path}==============".blue
+            puts `git clone #{repo_url} #{path}`
+          end
+        end
+
+        def run_git(podfile_instance)
+          podfile_instance.get_batch_local_pods.each_value do |value|
+            path = value[0][:path]
+            arg = @arguments.map do |v|
+              new_str = v.dup.gsub! /\s/, '_'
+              new_str == nil ? v : new_str
+            end
+            arg = arg.join(" ")
+            puts "============== #{path} 开始执行 git #{arg} 命令 ==============".blue
+            puts `git -C #{path} #{arg}`
+          end
+        end
+
+        def done_all(podfile_instance)
+          # 通过 local_batch 找出对应的group 和 branch 并分组
+          local_pods = podfile_instance.get_batch_local_pods
+          group_map = {}
+          local_pods.each_key do |name|
+            path = local_pods[name][0][:path]
+            git_url = `git -C #{path} remote get-url --push origin`
+            current_branch = `git -C #{path} branch --show-current`.delete!("\n")
+            group_name = get_group_with_repo(git_url)
+            puts "============== #{name} 当前分支 #{current_branch}  当前组 #{group_name} ==============".blue
+
+            group_key = "#{group_name}&&#{current_branch}"
+            repo_arr = group_map[group_key]
+            if repo_arr.is_a? Array
+              repo_arr << name
+            else
+              arr = [name]
+              group_map[group_key] = arr
+            end
+          end
+
+          # 生成对应的 bacth_pod_remte 字符串
+          pod_remote_str = ""
+          group_map.each_key do |key|
+            pod_remote_str << "  batch_pod_remote [\n"
+            pod_names = group_map[key]
+            pod_names.each do |name|
+              pod_remote_str << "    \"#{name}\",\n"
+            end
+            group = key.split("&&")[0]
+            branch = key.split("&&")[1]
+            pod_remote_str << "  ], \"#{branch}\", \"#{group}\"\n\n"
+          end
+          puts "将 local_batch 依赖 替换为 \n#{pod_remote_str}".blue
+
+          # 替换 podfile 中的local batch
+          podfile = File.join(Pathname.pwd, "Podfile")
+          podfile_str = File.read(podfile).gsub(/ *batch_pod_local *\[([^\].]*)\], *".*"/, pod_remote_str)
+          File.open(podfile, "r+") do |podfile|
+            podfile << podfile_str
+          end
+          puts "替换成功".blue
+        end
+
+        def find_repo_with_pod(pod_name)
+          sources = config.sources_manager.all
+          sources = sources.select do |s|
+            s.name == "2dfire-cocoapods-spec"
+          end
+          source = sources[0]
+          repo_path = source.repo.to_s + "/#{pod_name}"
+          versions = `ls #{repo_path}`.split("\n")
+          versions = versions.sort do |x ,y|
+            y<=>x
+          end
+          last_version = versions[0]
+          spec_file = `ls #{repo_path}/#{last_version}`.split("\n")[0]
+          spec = Pod::Spec.from_file("#{repo_path}/#{last_version}/#{spec_file}")
+          git_url = spec.attributes_hash["source"]["git"]
+          git_url
+        end
+
+        def get_group_with_repo(repo_url)
+          if repo_url.start_with?("http")
+            re = Regexp.new("git.2dfire.net/.*/")
+            repo_group = repo_url.match(re)[0][15..-2]
+          else
+            re = Regexp.new("git.2dfire.net:.*/")
+            repo_group = repo_url.match(re)[0][15..-2]
+          end
+          repo_group
+        end
+
+        private :clone_all, :run_git, :find_repo_with_pod, :done_all, :get_group_with_repo
+
       end
     end
   end

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

@@ -1,14 +1,9 @@
 
-require 'cocoapods-tdf-bin/command/bin/initHotKey'
 require 'cocoapods-tdf-bin/command/bin/init'
 require 'cocoapods-tdf-bin/command/bin/archive'
 require 'cocoapods-tdf-bin/command/bin/auto'
 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'
 
 module Pod

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.0.17'
+  VERSION = '0.0.21'
 end
 
 module Pod

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

@@ -43,9 +43,12 @@ module Pod
 
         local_pod_hash = get_batch_local_pods
         remote_pod_hash = get_batch_remote_pods
-        requirements = remote_pod_hash[name].nil? ? requirements : remote_pod_hash[name];
-        requirements = local_pod_hash[name].nil? ? requirements : local_pod_hash[name];
-
+        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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdf-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.21
 platform: ruby
 authors:
 - gaijiaofan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2021-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -97,15 +97,11 @@ files:
 - 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
-- lib/cocoapods-tdf-bin/command/bin/initHotKey.rb
-- lib/cocoapods-tdf-bin/command/bin/install.rb
 - lib/cocoapods-tdf-bin/command/bin/lib/lint.rb
 - lib/cocoapods-tdf-bin/command/bin/repo/update.rb
 - lib/cocoapods-tdf-bin/command/bin/spec/create.rb
 - lib/cocoapods-tdf-bin/command/bin/spec/push.rb
-- lib/cocoapods-tdf-bin/command/bin/update.rb
 - lib/cocoapods-tdf-bin/config/config.rb
 - lib/cocoapods-tdf-bin/config/config_asker.rb
 - lib/cocoapods-tdf-bin/config/config_builder.rb

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

@@ -1,46 +0,0 @@
-require 'cocoapods-tdf-bin/config/config_hot_key_asker'
-
-module Pod
-  class Command
-    class Bin < Command
-      class Imy < Bin
-        self.summary = '快捷键'
-        self.description = <<-DESC
-          创建  文件，在其中保存插件需要的配置信息，
-          如二进制私有源地址、源码私有源地址等。
-        DESC
-
-        self.arguments = [
-            CLAide::Argument.new('1', false)
-        ]
-
-        def self.options
-          [
-          ].concat(super)
-        end
-
-        def initialize(argv)
-          @hot_key = argv.shift_argument || '1'
-          super
-        end
-
-        def run
-          CBin.config_hot_key.set_hot_key_index(@hot_key)
-          UI.puts  "cd #{CBin.config_hot_key.hot_key_dir}".yellow
-
-          if Dir.exist?(CBin.config_hot_key.hot_key_dir)
-            Dir.chdir(CBin.config_hot_key.hot_key_dir) do
-              UI.puts " #{CBin.config_hot_key.hot_key_cmd}".yellow
-              system CBin.config_hot_key.hot_key_cmd
-            end
-          else
-            raise "配置项中文件目录不存在 #{CBin.config_hot_key.hot_key_dir}"
-          end
-
-
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,70 +0,0 @@
-
-require 'cocoapods-tdf-bin/config/config_hot_key_asker'
-
-module Pod
-  class Command
-    class Bin < Command
-      class Inithk < Bin
-        self.summary = '初始化快捷键配置.'
-        self.description = <<-DESC
-          创建  文件，在其中保存插件需要的配置信息，
-          如二进制私有源地址、源码私有源地址等。
-        DESC
-
-        def self.options
-          [
-            ['--bin-url=URL', '配置文件地址，直接从此地址下载配置文件']
-          ].concat(super)
-        end
-
-        def initialize(argv)
-          @bin_url = argv.option('bin-url')
-          super
-        end
-
-        def run
-          if @bin_url.nil?
-            config_with_asker
-          else
-            config_with_url(@bin_url)
-          end
-        end
-
-        private
-
-        def config_with_url(url)
-          require 'open-uri'
-
-          UI.puts "开始下载配置文件...\n"
-          file = open(url)
-          contents = YAML.safe_load(file.read)
-
-          UI.puts "开始同步配置文件...\n"
-          CBin.config_hot_key.sync_config(contents.to_hash)
-          UI.puts "设置完成.\n".green
-        rescue Errno::ENOENT => e
-          raise Informative, "配置文件路径 #{url} 无效，请确认后重试."
-        end
-
-        def config_with_asker
-          asker = CBin::Config_Hot_Key::Asker.new
-          asker.wellcome_message
-
-          config = {}
-          template_hash = CBin.config_hot_key.template_hash
-          template_hash.each do |k, v|
-            default = begin
-                        CBin.config_hot_key.send(k)
-                      rescue StandardError
-                        nil
-                      end
-            config[k] = asker.ask_with_answer(v[:description], default, v[:selection])
-          end
-
-          CBin.config_hot_key.sync_config(config)
-          asker.done_message
-        end
-      end
-    end
-  end
-end

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

@@ -1,44 +0,0 @@
-
-require 'cocoapods-tdf-bin/command/bin/update'
-module Pod
-  class Command
-    class Bin < Command
-      class Install < Bin
-        include Pod
-
-        self.summary = 'pod install 拦截器，会加载本地Podfile_local文件，DSL加载到原始Podfile文件中。'
-
-        self.description = <<-DESC
-          pod install 拦截器，会加载本地Podfile_local文件
-          会通过DSL加载到原始Podfile文件中
-          支持 pod 'xxx' 各种写法
-          支持 post_install/pre_install钩子，采用覆盖做法
-        DESC
-        def self.options
-          [
-            ['--repo-update', 'Force running `pod repo update` before install'],
-            ['--deployment', 'Disallow any changes to the Podfile or the Podfile.lock during installation'],
-            ['--clean-install', 'Ignore the contents of the project cache and force a full pod installation. This only ' \
-          'applies to projects that have enabled incremental installation']
-          ].concat(super).reject { |(name, _)| name == '--no-repo-update' }
-        end
-
-        def initialize(argv)
-          @update = argv.flag?('update')
-          super
-          @additional_args = argv.remainder!
-        end
-
-        def run
-          Update.load_local_podfile
-          argvs = [
-            *@additional_args
-          ]
-          gen = Pod::Command::Install.new(CLAide::ARGV.new(argvs))
-          gen.validate!
-          gen.run
-        end
-      end
-    end
-  end
-end

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

@@ -1,157 +0,0 @@
-
-require 'cocoapods'
-require 'cocoapods-tdf-bin/native/podfile_env'
-require 'cocoapods-tdf-bin/native/podfile'
-
-module Pod
-  class Command
-    class Bin < Command
-      class Update < Bin
-        include Pod
-        include Pod::Podfile::DSL
-
-        self.summary = 'pod update 拦截器，会加载本地Podfile_local文件，DSL加载到原始Podfile文件中。'
-
-        self.description = <<-DESC
-          pod update 拦截器，会加载本地Podfile_local文件
-          会通过DSL加载到原始Podfile文件中
-          支持 pod 'xxx' 各种写法
-          支持 post_install/pre_install钩子，采用覆盖做法
-        DESC
-        def self.options
-          [
-            ["--sources=#{Pod::TrunkSource::TRUNK_REPO_URL}", 'The sources from which to update dependent pods. ' \
-              'Multiple sources must be comma-delimited'],
-            ['--exclude-pods=podName', 'Pods to exclude during update. Multiple pods must be comma-delimited'],
-            ['--clean-install', 'Ignore the contents of the project cache and force a full pod installation. This only ' \
-              'applies to projects that have enabled incremental installation'],
-            ['--project-directory=/project/dir/', 'The path to the root of the project directory'],
-            ['--no-repo-update', 'Skip running `pod repo update` before install']
-          ].concat(super)
-        end
-
-        def initialize(argv)
-          @update = argv.flag?('update')
-          super
-          @additional_args = argv.remainder!
-        end
-
-        def run
-          Update.load_local_podfile
-
-          argvs = [
-            *@additional_args
-          ]
-
-          gen = Pod::Command::Update.new(CLAide::ARGV.new(argvs))
-          gen.validate!
-          gen.run
-        end
-
-        def self.load_local_podfile
-          # 同步 Podfile_local 文件
-          project_root = Pod::Config.instance.project_root
-          path = File.join(project_root.to_s, 'Podfile_local')
-          unless File.exist?(path)
-            path = File.join(project_root.to_s, 'Podfile_local')
-          end
-
-          if File.exist?(path)
-            contents = File.open(path, 'r:utf-8', &:read)
-
-            podfile = Pod::Config.instance.podfile
-            local_podfile = Podfile.from_file(path)
-
-            if local_podfile
-              local_pre_install_callback = nil
-              local_post_install_callback = nil
-              local_podfile.instance_eval do
-                local_pre_install_callback = @pre_install_callback
-                local_post_install_callback = @post_install_callback
-              end
-            end
-
-            podfile.instance_eval do
-              begin
-
-                # podfile HASH_KEYS才有plugins字段，否则会被限制
-                if local_podfile.plugins.any?
-                  hash_plugins = podfile.plugins || {}
-                  hash_plugins = hash_plugins.merge(local_podfile.plugins)
-                  set_hash_value(%w[plugins].first, hash_plugins)
-
-                  # 加入源码白名单，避免本地库被二进制了
-                  podfile.set_use_source_pods(local_podfile.use_source_pods) if local_podfile.use_source_pods
-                  podfile.use_binaries!(local_podfile.use_binaries?)
-                end
-
-                # 在target把local-target中到dependencies值删除了，再设置
-                # 把本地和原始到dependencies 合并，设置dependencies
-                local_podfile&.target_definition_list&.each do |local_target|
-                  next if local_target.name == 'Pods'
-
-                  target_definition_list.each do |target|
-
-                    unless target.name == local_target.name &&
-                        (local_target.to_hash['dependencies'] &&local_target.to_hash['dependencies'].any?)
-                      next
-                    end
-
-
-
-                    target.instance_exec do
-                      # 在target把local-target中到dependencies值删除了，再设置
-
-                      local_dependencies = local_target.to_hash['dependencies']
-                      target_dependencies = target.to_hash['dependencies']
-
-                      local_dependencies.each do |local_dependency|
-                        unless local_dependency.is_a?(Hash) && local_dependency.keys.first
-                          next
-                        end
-
-                        target_dependencies.each do |target_dependency|
-                          dp_hash_equal = target_dependency.is_a?(Hash) &&
-                            target_dependency.keys.first &&
-                            target_dependency.keys.first == local_dependency.keys.first
-                          dp_str_equal = target_dependency.is_a?(String) &&
-                            target_dependency == local_dependency.keys.first
-                          next unless dp_hash_equal || dp_str_equal
-
-                          target_dependencies.delete target_dependency
-                          break
-                        end
-                      end
-                      # 把本地和原始到dependencies 合并，设置dependencies
-                      local_dependencies.each do |d|
-                        UI.message "Development Pod #{d.to_yaml}"
-                        if podfile.plugins.keys.include?('cocoapods-tdf-bin')
-                          podfile.set_use_source_pods(d.keys.first) if (d.is_a?(Hash) && d.keys.first)
-                        end
-                      end
-                      new_dependencies = target_dependencies + local_dependencies
-                      set_hash_value(%w[dependencies].first, new_dependencies)
-
-                    end
-                  end
-
-                end
-
-                if local_pre_install_callback
-                  @pre_install_callback = local_pre_install_callback
-                end
-                if local_post_install_callback
-                  @post_install_callback = local_post_install_callback
-                end
-              rescue Exception => e
-                message = "Invalid `#{path}` file: #{e.message}"
-                raise Pod::DSLError.new(message, path, e, contents)
-              end
-            end
-
-          end
-        end
-      end
-    end
-  end
-end