pod-pipeline 0.5.7 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16980dad637c15796234c1cdb4e559152e1136397d6cf860d9cc9a3d1aaecca9
-  data.tar.gz: 1340eb923bc0856d793cecf302e64bc34e2e3fb59dd254b0e93130bc309fa96c
+  metadata.gz: d25938cced26fc15ef81da41b55733b9c8043c1cf0ef21dbb7b220b63d93bbd5
+  data.tar.gz: 127e94bfdef35248fa9ce8f82e4699722c19d49d49a03e608031705f13fb296a
 SHA512:
-  metadata.gz: 1955fd51720cb745dbfcd234dbd983ce0df51a0ebcad4366f8fd61ab8a792f8cf4b51f2ddde773252820378df4347011510d9282bc5917583d94902370649aee
-  data.tar.gz: 16ac4680004b7ebab8e0067037d2c67df4d44fc6f0b5ba0c1d08d184a56cd781b2eac5c54d65a5f64c6bb1dcc5fae8ffacf7c720e6a0efc3bae887103dba6104
+  metadata.gz: e4c077e56bc88e8bcb6802a2da7693250c7b12a310dc63aeadc4e0433d85c850148a7a8714b15e54cacd8d356f607d7d902d78d6b781304ae200cfc02a73bb89
+  data.tar.gz: 4fff1e1982fe98d629edf8cd62cf1058315b71ea062c05258ec08276980eeb1fc0fbf8546845a75f6cc43eec7980b47a8ebc9fdebc412150e63110f272305cb8

data/lib/pod-pipeline/command/build.rb

@@ -70,9 +70,11 @@ module PPL
                     XCodebuild.build(@workspace.path, @podspec.name, arch, @configuration, @build_path)
                 end
 
-                #合并头文件
-                puts "\n[合并 #{@combines.join(", ")} 的头文件]"
-                combine_headers(@combines.include?('local'), @combines.include?('pod'))
+                if @combine_headers
+                    #合并头文件
+                    puts "\n[合并 #{@combines.join(", ")} 的头文件]"
+                    combine_headers(@combines.include?('local'), @combines.include?('pod'))
+                end
 
                 #合并二进制文件
                 puts "\n[合并 #{@combines.join(", ")} 的二进制文件]"
@@ -101,36 +103,35 @@ module PPL
             end
     
             def add_headers
-                # header_stands = "#{@output}/Example/Pods/Headers/Public/#{@podspec.name}/*.h"
-                # Dir[header_stands].each do |header_stand|
-                #     if File.ftype(header_stand).eql? 'link'
-                #         header_file = "#{File.dirname(header_stand)}/#{File.readlink(header_stand)}"
-                #         if File.ftype(header_file).eql? 'file'
-                #             header_file_basename = File.basename(header_file)
-                #             if !(File.exist? "#{@framework_headers_path}/#{header_file_basename}")
-                #                 puts header_file_basename
-                #                 FileUtils.cp(header_file, @framework_headers_path)
-                #             end
-                #         end
-                #     end
-                # end
-                # header_files = "#{@build_path}/**/#{@podspec.name}.framework/Headers/*.h"
-                # Dir[header_files].each do |header_file|
-                #     if File.ftype(header_file).eql? 'file'
-                #         header_file_basename = File.basename(header_file)
-                #         if !(File.exist? "#{@framework_headers_path}/#{header_file_basename}")
-                #             puts header_file_basename
-                #             FileUtils.cp(header_file, @framework_headers_path)
-                #         end
-                #     end
-                # end
+                header_stands = "#{@output}/Example/Pods/Headers/Public/#{@podspec.name}/*.h"
+                Dir[header_stands].each do |header_stand|
+                    if File.ftype(header_stand).eql? 'link'
+                        header_file = "#{File.dirname(header_stand)}/#{File.readlink(header_stand)}"
+                        if File.ftype(header_file).eql? 'file'
+                            header_file_basename = File.basename(header_file)
+                            if !(File.exist? "#{@framework_headers_path}/#{header_file_basename}")
+                                puts header_file_basename
+                                FileUtils.cp(header_file, @framework_headers_path)
+                            end
+                        end
+                    end
+                end
+                header_files = "#{@build_path}/**/#{@podspec.name}.framework/Headers/*.h"
+                Dir[header_files].each do |header_file|
+                    if File.ftype(header_file).eql? 'file'
+                        header_file_basename = File.basename(header_file)
+                        if !(File.exist? "#{@framework_headers_path}/#{header_file_basename}")
+                            puts header_file_basename
+                            FileUtils.cp(header_file, @framework_headers_path)
+                        end
+                    end
+                end
             end
     
             def combine_headers(local_dependency, pod_dependency)
                 headers = "#{@framework_path}/Headers"
                 #添加 构建生成的二进制文件
                 inputs = []
-                inputs << "#{@build_path}/*/**/#{@podspec.name}.framework"
                 if local_dependency
                     #添加 本地依赖的二进制文件
                     inputs << "#{@output}/#{@podspec.name}/Frameworks/**/*.framework"
@@ -143,6 +144,8 @@ module PPL
                 end
     
                 Header.combine(headers, inputs, @combine_include, @combine_exclude)
+
+                add_headers
             end
 
             def combine_binarys(local_dependency, pod_dependency)

data/lib/pod-pipeline/command/scan/depend.rb

@@ -0,0 +1,36 @@
+require 'pod-pipeline/util/scanner'
+
+module PPL
+  class Command
+      class Scan < Command
+          class Depend < Scan
+              self.summary = '输出 Pod 配置信息'
+
+              self.description = <<-DESC
+                  输出 Pod 配置信息。
+              DESC
+      
+              self.arguments = [
+                  CLAide::Argument.new('项目根目录（默认使用当前目录）', false),
+              ]
+              def self.options
+                  [].concat(super)
+              end
+      
+              def initialize(argv)
+                  @path                   = argv.arguments!
+                
+                  @projectPath = @path.count.zero? ? Pathname.pwd.to_s : @path.first
+      
+                  super
+              end
+      
+              def run
+                  PPL::Scanner.new(@projectPath, ['depend']).run
+                  
+                  puts "#{PPL::Scanner.depend}" if PPL::Scanner.depend
+              end
+          end
+      end
+  end
+end

data/lib/pod-pipeline/command/scan.rb

@@ -1,5 +1,6 @@
 require 'pod-pipeline/command/scan/name'
 require 'pod-pipeline/command/scan/version'
+require 'pod-pipeline/command/scan/depend'
 require 'pod-pipeline/command/scan/remote'
 require 'pod-pipeline/command/scan/branch'
 require 'pod-pipeline/command/scan/workspace'

data/lib/pod-pipeline/util/header.rb

@@ -45,6 +45,15 @@ module PPL
       input_queue
     end
 
+    def self.combine_reset(header, include_list)
+      content = File.read(header)
+      replace = PPL::Scanner.name
+      include_list.each do |include_name|
+        content = content.gsub(include_name, replace)
+      end
+      File.write(header, content)
+    end
+
     def self.combine(output, inputs, include_list = [], exclude_list = [])
       puts "\n目标文件：#{output}\n"
 
@@ -53,6 +62,9 @@ module PPL
           FileUtils.cp(header, output, 'preserve': true)
         end
       end
+      Dir["#{output}/*.h"].each do |header|
+        combine_reset(header, include_list)
+      end
     end
   end
 end

data/lib/pod-pipeline/util/scanner.rb

@@ -10,6 +10,7 @@ module PPL
         @@linter = nil
         @@name = nil
         @@version = nil
+        @@depend = nil
         @@git = nil
         @@remote = nil
         @@branch = nil
@@ -30,6 +31,7 @@ module PPL
                     @@linter = scan_pod @projectPath
                     @@name = @@linter.spec.name
                     @@version = @@linter.spec.version
+                    @@depend = @@linter.spec.dependencies
                     @@git = scan_git @projectPath
                     @@remote = @@git.remote
                     @@branch = @@git.branches.current.first
@@ -40,6 +42,9 @@ module PPL
                 when "version"
                     @@linter = scan_pod @projectPath
                     @@version = @@linter.spec.version
+                when "depend"
+                    @@linter = scan_pod @projectPath
+                    @@depend = @@linter.spec.dependencies.map{ |depend| depend.name }.join(',')
                 when "remote"
                     @@git = scan_git @projectPath
                     @@remote = @@git.remote
@@ -68,6 +73,10 @@ module PPL
             @@version
         end
 
+        def self.depend
+            @@depend
+        end
+
         def self.git
             @@git
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-pipeline
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.9
 platform: ruby
 authors:
 - 郑贤达
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-05 00:00:00.000000000 Z
+date: 2023-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -120,6 +120,7 @@ files:
 - lib/pod-pipeline/command/scan.rb
 - lib/pod-pipeline/command/scan/all.rb
 - lib/pod-pipeline/command/scan/branch.rb
+- lib/pod-pipeline/command/scan/depend.rb
 - lib/pod-pipeline/command/scan/name.rb
 - lib/pod-pipeline/command/scan/remote.rb
 - lib/pod-pipeline/command/scan/version.rb