cocoapods-BDTransform 5.1.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b2e2ef9a1b3343574c504e8ac1322c643afa4b134429ca63dd99bbc8897ad93
-  data.tar.gz: 712b8dac3e56617535fa4778344114c28948960c39ff0876f028fa3515d0be17
+  metadata.gz: b8225bf5fad9c8440b3019b63b6c4e5256862a49a39536d137b5d158bd512e9c
+  data.tar.gz: 00a2883482e24f38254d63a42a09c58c5c6f67b31c441ecc8ff9cca6e87cc415
 SHA512:
-  metadata.gz: 6db3687c0fe4cc5542a3cc500073c2fcf105bec23f6955a77afedba8dd90370d507156c06d37b1f57668f91a5e54ba5c2bfbe06181a89bea933ca43788695adb
-  data.tar.gz: fa3c2533257861c8ed39ef8cab38b326580e606c5c3d98092f22ebe3ad8f45212c5ff78a04baa7847f75f555987b537624af395cad46c2e1cf296a0845a44179
+  metadata.gz: f18638c6cffcabf76528e1545a119722feb9f15178cf9cf5413f037068d093a0c316aa7407c2b9a9b3bc48222e6a217eb9520f82cad97858018f1da90332fd05
+  data.tar.gz: 1b428512a2436e0ea64634ae4ee8b809f8583e8563e52720a27a97f0af90ea9b1d188fdce42078015365fb3d13334754902cfbe60220eb702f331afce6ae24d1

data/lib/cocoapods-BDTransform/command/BDTransform/AweToLog.rb

@@ -19,40 +19,118 @@ module BDAwesomeTransmit
 
     attr_accessor :repo
 
-    def initialize(repoName)
+    def initialize(repoName,dev_path = nil)
       @repoName = repoName
+      
+      @dev_path = dev_path
     end
 
 
     def run
+      getComponentVersion
       requirePodspecInfo
-      checkUserPermission
+      requirePodspecInfoIfNeeded
       establishGitRepo
+      trans_dev_if_needed
     end
 
     private
 
+    def trans_dev_if_needed
+       return unless @dev_path
+       @@project = Xcodeproj::Project.open('Pods/Pods.xcodeproj')
+
+       unless isContainDevPod
+        dev_pods = @@project.main_group.new_group('Development Pods') 
+        @@project.main_group.children.pop()
+        @@project.main_group.children.insert(1,dev_pods)
+       end
+       pod_g = pod_group(@repoName)
+       unless isInDevPod(@repoName)
+         pod_g.move(development_pod)
+       end
+       `
+       test -d "#{@dev_path}/#{@repoName}" || mv Pods/"#{@repoName}" "#{@dev_path}"
+       rm -rf Pods/"#{@repoName}"
+       last=\`pwd\`
+       cd "#{@dev_path}"
+       ln -fs \`pwd\`/"#{@repoName}" $last/Pods
+       `
+       if pod_g.is_a? Xcodeproj::Project::Object::PBXFileReference
+          
+          pod_proj = Xcodeproj::Project.open(pod_g.real_path)
+          pod_proj_g = pod_proj.groups.find { |group| group.name == @repoName }
+          pod_proj_g.set_path("#{@dev_path}/#{@repoName}")
+          pod_proj_g.groups.find{|group| group.name == 'Support Files'}.set_path("#{Dir.pwd}/Pods/Target Support Files/#{@repoName}")
+          pod_proj.save
+          @@project.save
+       else
+          pod_g.set_path("#{@dev_path}/#{@repoName}")
+          pod_g.groups.find{|group| group.name == 'Support Files'}.set_path("#{Dir.pwd}/Pods/Target Support Files/#{@repoName}")
+          @@project.save
+       end
+       
+    end
+
+
+    def getComponentVersion
+      manifestpath = Pathname.new('Pods/Manifest.lock')
+      @repo_version = Pod::Lockfile.from_file(manifestpath).version(@repoName)
+    end
+
 # 检测用户权限
 
     def checkUserPermission
+      transhomepage
       return unless @repohomepage
-      # raise "没有权限访问 #{@repoName} 源码" unless Pod::HTTP::validate_url(@repohomepage).success?
+      raise "没有权限访问 #{@repoName} 源码,源码地址：#{@repohomepage}" unless Pod::HTTP::validate_url(@repohomepage).success?
+    end
+
+    def transhomepage
+      return if @repohomepage
+      @repohomepage = @repo.gsub('git@code.byted.org:','https://code.byted.org/') if @repo.include? 'git@code.byted.org:'
+      @repohomepage = @repohomepage.gsub('.git','')
     end
 
 # 获取 pod 的基本信息
 
     def requirePodspecInfo
+      transform_path = Pathname.new('Pods/transform.json')
+      if File.exist? transform_path
+        repo_infos = JSON.parse(File.read(transform_path))
+        if repo_infos.has_key? @repoName
+          @checkoutinfo = repo_infos[@repoName]['commit']
+          @repo = repo_infos[@repoName]['git']
+        end
+      end
+    end
+
+    def requirePodspecInfoIfNeeded
+      return if @repo && @checkoutinfo
       url = "https://ios.bytedance.net/api/v1/repo/all?appType=1&offset=1&limit=10&search=#{@repoName}&appId=-1"
       req = REST.get(url, 'Authorization' => 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoid3VzaXpoZW4uYXJjaCIsImlhdCI6MTU0NDYwMjI5MH0.daVOz8_8Er0qTv1c4w5O7nGC9D-doDqlcaXOC4SBo2k')
       pods = JSON.parse(req.body)
       raise "没有在无线研发平台上发现对应的组件：#{@repoName},请重试一下" if pods['data']['count'] == 0
-      @repo = pods['data']['rows'].find { |component| component['repoName'] == @repoName}['repo']
+      repo_info = pods['data']['rows'].find { |component| 
+        if component['repoName'] == @repoName
+          find_version = "http://mobile.bytedance.net/inner_mpaas/v2/repo/searchUpgradeHistoryDetail?repo_id=#{component['id']}&version=#{@repo_version}"
+          req = REST.get(find_version)
+          info = JSON.parse(req.body)
+          if info['err_no'].to_i == 0
+            @checkoutinfo = info['data']['commit_id']
+            true
+          end
+        end
+        
+      }
+      raise "没有找到名为 #{@repoName} 的组件" unless repo_info
+      raise "没有找到 #{@repoName} #{@repo_version} 版本的 commit 信息，请在 Bus 平台查看" unless repo_info
+
+      @repo = repo_info['repo']
       
       @repohomepage = pods['data']['rows'][0]['repohomepage']
     end
 
-
-
 # 获取Git地址
 
     def establishGitRepo
@@ -61,13 +139,15 @@ module BDAwesomeTransmit
       Dir.mktmpdir{|dir|
         Pod::CoreUI.print("-- 正在部署 #{@repoName} ")
         Pod::CoreUI.print(" ")
+        
         output = `
           cd #{dir}
           git clone -q #{@repo} #{@repoName}
           cd #{@repoName}
+          git checkout -q #{@checkoutinfo}
           echo "#{cdir}/.git"
           test -d #{cdir}/.git && rm -rf #{cdir}/.git
-          mv -f .git #{cdir}
+          mv -f .git #{cdir} && cd #{cdir} && git reset --hard
         `.lines.to_a
         if $?.exitstatus != 0
           Pod::CoreUI.warn('[ERROR] 部署失败，请产看原因:')
@@ -77,5 +157,49 @@ module BDAwesomeTransmit
       }
     end
 
+    # 工具方法
+    def isInDevPod(pod_name)
+      development_pods.find { |group| group.name == pod_name || group.path == pod_name }.class != NilClass
+    end
+
+    def isInNormalPods(pod_name)
+      pods.find { |group| group.name == pod_name || group.path == pod_name }
+    end
+
+    def pod_group(pod_name)
+      pod_groups.find { |group| group.name == pod_name || group.path == pod_name }
+    end
+
+    def pod_groups
+      if development_pods
+        return pods + development_pods
+      end
+      return pods
+    end
+
+    def development_pod
+      if isContainDevPod
+        return @@project.groups.find { |group| group.name == 'Development Pods' }
+      end
+    end
+
+
+    def pods
+      find = @@project.groups.find { |group| group.name == 'Pods' }
+      find.children.objects
+    end
+
+    def development_pods
+      if isContainDevPod
+        return @@project.groups.find { |group| group.name == 'Development Pods' }.children.objects
+      end
+    end
+
+    def isContainDevPod
+      find = @@project.groups.find { |group| group.name == 'Development Pods' }
+      find.class != NilClass
+    end
+
   end
 end
+

data/lib/cocoapods-BDTransform/command/BDTransform/ToLog.rb

@@ -52,10 +52,17 @@ module Pod
           CLAide::Argument.new('podName', true),
         ]
 
+        def self.options
+          [
+            ['--dev_path=',     'Mbox 专属，用于将转化后的 组件 移动到指定的目录下，以此无需pod install 即可进行 dev 开发']
+            
+          ]
+        end
+
         def initialize(argv)
           
           @bd_transform_pod = argv.arguments
-          
+          @dev_path = argv.option('dev_path')
         end
 
         def validate!
@@ -63,6 +70,9 @@ module Pod
           help! 'A Pod name is required.' unless @bd_transform_pod.count > 0
           targetDir = Dir::pwd + '/Pods/' + @bd_transform_pod[0]
           help! "目录 #{targetDir} 不存在,请在 Podfile 同级目录下执行" unless File::exist?(Dir::pwd + '/Pods/' + @bd_transform_pod[0])
+          if @dev_path
+            raise "#{@dev_path} 不存在" unless File.exist? @dev_path
+          end
         end
 
         def run
@@ -74,7 +84,7 @@ module Pod
             else
               require 'cocoapods-BDTransform/command/BDTransform/AweToLog.rb'
             end
-            log = BDAwesomeTransmit::BDPodsTransLog.new(@bd_transform_pod[0])
+            log = BDAwesomeTransmit::BDPodsTransLog.new(@bd_transform_pod[0],@dev_path)
             log.run
           end
         end

data/lib/cocoapods-BDTransform/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsBdtransform
-  VERSION = "5.1.0"
+  VERSION = "6.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-BDTransform
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 6.0.0
 platform: ruby
 authors:
 - bupterambition
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2019-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
@@ -123,7 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A longer description of cocoapods-BDTransform.