luna-binary-uploader 0.1.29 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a64ef0ed106b66d7fa7f926afc2d41019ab289aa2a87b32f11d2cb256d85026d
-  data.tar.gz: be92b70bc9b1376efb6d24d9ce79c97a3d11f3417cab09877449e1e5fc579a07
+  metadata.gz: 8dd0d0b6939b899cce6afd8f6facda8c39953c3087b36979c2946695a96aaa4e
+  data.tar.gz: 3802bd473598d0086a817bcbc717b432fb06df527a0bcc7ca5462faaca1136f9
 SHA512:
-  metadata.gz: 500ae49323f2dee4df985e9ef024948f5e4836ed5d7e0c443b8422997531db9306d964d8981c1a2248b7de1127c38dc4b677e68922231f3be7c99ba01c1044e2
-  data.tar.gz: 8df86a63ee0dbe5edaf0138c31037b91036d821a9aa17da5868e4415a9be6f5190c9427f6be2c6f960937e6306ba16855770d22046bce11f07a123be82370398
+  metadata.gz: 8924d7c279fca47b5877d469a31e05f2340f203c3da2809538bb0ff3a59286f2e0324a5874fe6b35c8d77898db0f95bb8b3df79a9e1fb12cc3d7bb28935296d6
+  data.tar.gz: 219f74424351db948c80bc4c06de92857ba31e436f1634c891d7f9190ff105f25258518644a8875338268dac676650734e45630f18f3b7c633a518a45ee43274

data/bin/lbu

@@ -25,8 +25,12 @@ class App
     arg_name 'url地址'
     command :init do |c|
       c.action do |global_options,options,args|
-        help_now!('url is required') if args.empty?
-        Luna::Binary::Init.new(args[0])
+        # help_now!('url is required') if args.empty?
+        templateFileUrl = 'http://ydlunacommon-cdn.nosdn.127.net/38cb10ff0440170ca11d93d02e4ed562.yml'
+        if args.count > 0
+          templateFileUrl = args[0]
+        end
+        Luna::Binary::Init.new(templateFileUrl)
       end
     end
 
@@ -49,13 +53,15 @@ class App
     desc '单个上传二进制文件'
     arg_name 'a.模块名 git地址 git节点 xcode编译的缓存地址 \n b.模块名 版本号 xcode编译的缓存地址 \n c.模块名 本地podspec地址 xcode编译的缓存地址'
     command :single do |c|
+      c.desc '强制上传 -f or --force'
+      c.switch [:f,:force]
       c.action do |global_options,options,args|
         if args[3] #模式1
           Luna::Binary::Uploader::SingleUploader.new(args[0],args[1],args[2], args[3]).upload
         else 
           moduleName = args[0]
           args1 = args[1]
-          binaryPath= args[2]
+          binaryPath= args[2] != nil ? args[2] : Luna::Binary::Common.instance.binary_path_merged
           version = args1
           if File.exist?(args1)
             spec = Pod::Specification.from_file(Pathname.new(args1))
@@ -70,6 +76,11 @@ class App
                     spec = Pod::Specification.from_file(pathArr.first)
                     uploader = Luna::Binary::Uploader::SingleUploader.new(moduleName, "", "", binaryPath)
                     uploader.specification=spec
+                    if options[:force]
+                      puts '先删除现有的: ' + moduleName + " " + version
+                      uploader.refresh_specification_work
+                      Luna::Binary::Delete.new(moduleName, version).delete
+                    end
                     uploader.upload
                 else 
                   raise "没有找到#{moduleName}"
@@ -116,8 +127,9 @@ class App
     command :refresh do |c|
       c.desc '是否需要build, 不需要的话 -n or --no'
       c.switch [:n,:no]
+      c.desc '是否快速执行, -q or --quick 开启后将不会重新执行pod install'
       c.switch [:q,:quick]
-      c.action do |global_options,options,args|
+      c.action do |global_options, options, args|
         if options[:no]
           obj = Luna::Binary::Refresh.new()
           if args[0] != nil
@@ -127,16 +139,7 @@ class App
           end
           obj.run
         else
-          help_now!('args is required') if args.empty?
-          help_now!('workspace is required') if args[0] == nil
-          help_now!('scheme is required') if args[1] == nil
-          build = Luna::Binary::Build.new()
-          build.workspace=args[0]
-          build.scheme=args[1]
-          if options[:quick]
-            build.needPodInstall = false
-          end
-          if build.run
+          if build(global_options, options, args)
             obj = Luna::Binary::Refresh.new()
             obj.binary_path = Luna::Binary::Common.instance.binary_path_merged
             obj.run
@@ -146,21 +149,29 @@ class App
       end
     end
 
+    def self.build(global_options, options, args)
+      workspace = args[0] != nil ? args[0] : Luna::Binary::Common.instance.bin_dev['workspace']  
+      scheme = args[1] != nil ? args[1] : Luna::Binary::Common.instance.bin_dev['scheme']
+      help_now!('workspace is required and no config in bin_config.yml') if workspace == nil
+      help_now!('scheme is required and no config in bin_config.yml') if scheme == nil
+      build = Luna::Binary::Build.new()
+      build.workspace = workspace 
+      build.scheme = scheme
+      if options[:quick]
+        build.needPodInstall = false
+      else
+        build.needPodInstall = true
+      end
+      build.run
+    end
+
     desc 'build项目并合成带有arm64&x86的framework'
     arg_name '1.xcworkspace 名称 eg:MyWorkSpace.xcworkspace 2.scheme eg: MyProject'
     command :build do |c|
+      c.desc '是否快速执行, -q or --quick 开启后将不会重新执行pod install'
       c.switch [:q,:quick]
-      c.action do |global_options,options,args|
-        help_now!('args is required') if args.empty?
-        help_now!('workspace is required') if args[0] == nil
-        help_now!('scheme is required') if args[1] == nil
-        obj = Luna::Binary::Build.new()
-        obj.workspace=args[0]
-        obj.scheme=args[1]
-        if options[:quick]
-          build.needPodInstall = false
-        end
-        obj.run
+      c.action do |global_options, options, args|
+        build(global_options, options, args)
       end
     end
 
@@ -200,6 +211,7 @@ class App
     command :publish do |c|
       c.desc '是否需要build, 不需要的话 -n or --no'
       c.switch [:n,:no]
+      c.desc '是否快速执行, -q or --quick 开启后将不会重新执行pod install'
       c.switch [:q,:quick]
       c.action do |global_options,options,args|
         if options[:no]
@@ -211,15 +223,7 @@ class App
           end
           update.run
         else
-          help_now!('workspace is required') if args[0] == nil
-          help_now!('scheme is required') if args[1] == nil
-          build = Luna::Binary::Build.new()
-          build.workspace=args[0]
-          build.scheme=args[1]
-          if options[:quick]
-            build.needPodInstall = false
-          end
-          if build.run
+          if build(global_options, options, args)
             update = Luna::Binary::Update.new()
             update.binary_path = Luna::Binary::Common.instance.binary_path_merged
             update.run

data/lib/luna/binary/build.rb

@@ -5,6 +5,7 @@ require 'cocoapods-imy-bin/config/config'
 require 'cocoapods-imy-bin'
 require 'json'
 require 'luna/binary/common/common'
+require 'luna/binary/util/file_processer'
 
 module Luna
     module Binary
@@ -89,6 +90,15 @@ module Luna
             def mergeFrameWork(moduleName, path1, path2)
                 command("mkdir -p #{binary_path_merged}; cp -r #{File.dirname(path1)} #{binary_path_merged}; cp -r #{File.dirname(path2)} #{binary_path_merged}; mv #{binary_path_merged}/#{File.basename(File.dirname(path1))} #{binary_path_merged}/#{moduleName};")
                 framework_name = moduleName.gsub("-", "_")
+
+                # 修复Xcode14编译出来的framework里的header写死了x86判断的问题
+                FileProcesserManager.new("#{binary_path_merged}/#{moduleName}/#{framework_name}.framework/Headers/*", 
+                [
+                    FileProcesser.new(-> (fileContent) {
+                        return fileContent.sub( "#elif defined(__x86_64__) && __x86_64__", "#elif (defined(__x86_64__) && __x86_64__) || (defined(__arm64__) && __arm64__)" )
+                    })
+                ]).process()
+
                 return command("lipo -create #{path2}/#{framework_name} #{path1}/#{framework_name} -output #{binary_path_merged}/#{moduleName}/#{framework_name}.framework/#{framework_name}")
             end
     

data/lib/luna/binary/common/common.rb

@@ -76,9 +76,9 @@ module Luna
               @podFilePath = Pathname.new(result.strip! + "/Podfile.lock")
             end
 
-            def command(c)
-              p c
-              return system c
+            def command(commandStr)
+              puts commandStr.yellow
+              return system commandStr
             end
             
             def findLintPodspec(moduleName)
@@ -221,7 +221,7 @@ module Luna
 
           def bin_dev
             if @bin_dev == nil
-              @bin_dev = YAML.load_file("#{Pod::Config.instance.home_dir}/bin_dev.yml")
+              @bin_dev = YAML.load_file("./bin_config.yml")
             end
             return @bin_dev
           end

data/lib/luna/binary/init.rb

@@ -16,7 +16,7 @@ module Luna
             end
 
             def run
-                 Common.instance.command("curl -o #{Pod::Config.instance.home_dir}/bin_dev.yml #{url}")
+                 Common.instance.command("curl -o ./bin_config.yml #{url}")
                  Common.instance.command("pod repo add z-ios-framework-spec-repo #{Common.instance.binary_repo_url}")
             end
 

data/lib/luna/binary/uploader/version.rb

@@ -1,7 +1,7 @@
 module Luna
   module Binary
     module Uploader
-      VERSION = "0.1.29"
+      VERSION = "0.1.31"
     end
   end
 end

data/lib/luna/binary/uploader.rb

@@ -37,7 +37,6 @@ module Luna
         end
 
         def upload
-          specificationWork
           push
         end
 
@@ -72,16 +71,32 @@ module Luna
           
           ensure
             download_git
-            
-            if isHasSpecInRepo == false && isHasFrameworkInService == false
-              @spec = createFrameworkSpec
-              write_spec_file(@spec)
-            else
+
+            if local_path != nil
+              localSpecUpVersion
+            elsif isHasSpecInRepo == true || isHasFrameworkInService == true
               raise "已存在repo or 二进制服务 #{specification.name} #{specification.version}"
             end
+
+
+            @spec = createFrameworkSpec
+            write_spec_file(@spec)
           end
         end
 
+        def localSpecUpVersion
+          nowTime = Time.now
+          timeStamp = "#{nowTime.year}-#{nowTime.month}-#{nowTime.day}"
+          specification.version = Util.writeVersionUp(local_path, specification.version)
+          branchName = "lbu-#{timeStamp}"
+          command("git checkout -b #{branchName}")
+          # 保证最新节点防止push不上去
+          command("git pull origin #{branchName}")
+          command("git add #{local_path};")
+          command("git commit -m 'Mod: 修改版本号为:#{specification.version.to_s} by LBU';")
+          command("git push -f origin #{branchName}")
+        end
+
         def refresh_specification_work
           begin
             clearTempFile

data/lib/luna/binary/util/file_processer.rb

@@ -0,0 +1,111 @@
+#!/usr/bin/ruby
+
+$LOAD_PATH << '.'
+
+class YDFileUtils
+    def self.writeFile (filePath, buffer)
+        File.open(filePath, "w") { |source_file|
+            source_file.write buffer
+        }
+        return
+    end
+end
+
+class FileProcesserInterface
+    def process(filePath)
+        puts filePath
+    end
+end
+
+class FileProcesser < FileProcesserInterface
+    def initialize(processFunc)
+        @processFunc = processFunc
+    end
+
+    def process(filePath)
+        fileContent = File.read(filePath)
+        result = @processFunc.call(fileContent)
+        File.write(filePath, result)
+    end
+end
+
+class RegexFileProcesser < FileProcesserInterface
+
+    def initialize(regex, genLineFunc)
+        @regex = regex
+        @genLineFunc = genLineFunc
+    end
+
+    def process(filePath)
+        buffer = ""
+        IO.foreach(filePath) { |line|
+            current_number_regex = line =~ @regex
+            if current_number_regex
+                regexCatchedValue = $~
+                buffer += line.gsub(@regex, @genLineFunc.call(regexCatchedValue))
+            else
+                buffer += line
+            end
+        }
+        YDYDFileUtils.writeFile(filePath, buffer)
+    end
+end
+
+
+
+class FileProcesserManager
+
+    def initialize(files, fileProcesserList)
+        @files = files
+        @fileProcesserList = fileProcesserList
+    end
+
+    private def getFiles()
+        mappingFiles = Dir::glob(@files)
+        return mappingFiles
+    end
+
+    private def processFile(filePath)
+        @fileProcesserList.each { |processer|
+            processer.process(filePath)
+        }
+    end
+
+    public def process()
+        ocFiles = getFiles()
+        puts "共发现 #{ocFiles.count} 个文件可能需要替换"
+        
+        @@count = 0
+        ocFiles.each do |filePath|
+            processFile(filePath)
+        end
+    end
+end
+
+##### 最简调用示例
+# FileProcesserManager.new("../**/*.{m,mm}", [FileProcesserInterface.new()]).process()
+
+#### 通过 RegexFileProcesser 处理文件
+# FileProcesserManager.new("../YoudaoDict/Vendor/SwipeView/SwipeView.m", 
+#     [
+#         RegexFileProcesser.new(/SwipeView/, -> (regexCatchedValue) {
+#             return "#{regexCatchedValue.to_s}aaa"
+#         })
+# ]).process()
+
+#### 通过gsub处理文件
+# FileProcesserManager.new("../YoudaoDict/Vendor/SwipeView/SwipeView.m", 
+#     [
+#         FileProcesser.new(-> (fileContent) {
+#             fileContent.gsub(/(SwipeView)/, "aaa\\1")
+#         })
+# ]).process()
+
+# FileProcesserManager.new("../YoudaoDict/Vendor/SwipeView/SwipeView.m", 
+#     [
+#         FileProcesser.new(-> (fileContent) {
+#             fileContent.gsub(/(SwipeView)/) do |ste|
+#                 "#{$1} use gsub block"
+#             end
+#         })
+# ]).process()

data/lib/luna/binary/util/util.rb

@@ -0,0 +1,40 @@
+require "luna/binary/uploader/version"
+require "cocoapods"
+require 'cocoapods-imy-bin/native/sources_manager'
+require 'cocoapods-imy-bin/config/config'
+require 'cocoapods-imy-bin'
+require 'json'
+require 'luna/binary/common/common'
+
+
+module Luna
+  class Util
+    def initialize
+      super.initialize
+    end
+
+    def self.versionUp(version)
+      newVersion = "#{version.major}.#{version.minor}.#{version.patch + 1}"
+      return Pod::Version.new(newVersion)
+    end
+
+    def self.writeVersionUp(path, version)
+      newVersion = versionUp(version)
+      buffer = ""
+      File.open(path, 'r:utf-8') do  |f|
+        f.each_line do |item|
+          if item[".version"]
+            buffer += item.gsub(/(\.version *= *')(.*')/, "\\1" + newVersion.to_s + "'")
+          else
+            buffer += item
+          end
+        end
+      end
+
+      File.open(path, 'w+') do |f|
+        f.write(buffer)
+      end
+      return newVersion
+    end
+  end
+end

data/lib/luna-binary-uploader.rb

@@ -6,5 +6,6 @@ require "luna/binary/build"
 require "luna/binary/update"
 require "luna/binary/install"
 require "luna/binary/init"
+require "luna/binary/util/util"
 require "luna/binary/common/common"
 require "luna/binary/benchmark"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luna-binary-uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.31
 platform: ruby
 authors:
 - 车德超
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-24 00:00:00.000000000 Z
+date: 2022-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -153,6 +153,8 @@ files:
 - lib/luna/binary/update.rb
 - lib/luna/binary/uploader.rb
 - lib/luna/binary/uploader/version.rb
+- lib/luna/binary/util/file_processer.rb
+- lib/luna/binary/util/util.rb
 - luna-binary-uploader.gemspec
 homepage: https://github.com/YoudaoMobile/luna-binary-uploader
 licenses: