luna-binary-uploader 0.1.8 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8eb081de584f9444708a84d7af3953965872eae7254aaa34d1744b7f635778fc
-  data.tar.gz: db0c4458a6b710f0fa9e5973d6b89c84d8bebebf79511df7cda1eda1eff05d08
+  metadata.gz: 608a62aecb8dd5d6cf698087cee24847b10617e1240aca9a6437172022b9e9ad
+  data.tar.gz: 513795f19904b0084ccc51adf8ef93e771197d8e9118b05e0f2df536828e8ccc
 SHA512:
-  metadata.gz: 90ebddb758d1deaf84b6d9681fd27b3adb9027859c55e53f0aaed7020c7d171fe4ab8fdad1066f358c1fd49054e7c7ddfc63ed8c3258e7c1504e8f8c9e77d717
-  data.tar.gz: 5c3f759c39fbd1f09009b4002bdfb2fd2eec238b76c9e9659f0a1d25711d4bad4ee912683925ffe939c05f399e8daaf2a92538aea37fda0b8c46c8cccfb773d7
+  metadata.gz: 1bef91e202cad493b558e187764bfa65d035ee5338f75b85bc7728474285d5b664a3fbf9802cd2a6b6c9ace2a447bf077963c65fc29d5624df170ad2287041d1
+  data.tar.gz: c7ca273c584f1507e4c75ba5c71d84fe7f20ff073c26e286d638e4dc38b35d69ab9201ef9512e9a18ce261ccb786bf37ef4b26e113db12b2f8dd1d0d16accc99

data/.gitignore

@@ -6,4 +6,9 @@
 /pkg/
 /spec/reports/
 /tmp/
-Gemfile.lock
+Gemfile.lock
+Podfile
+Podfile.lock
+temp-luna-uploader/
+vendor/
+Embed/

data/bin/lbu

@@ -111,7 +111,7 @@ class App
         else
           obj.binary_path = Luna::Binary::Common.instance.binary_path_merged
         end
-        obj.needUpload = args[1]
+        obj.need_upload = args[1]
         obj.run
       end
     end

data/lib/luna/binary/build.rb

@@ -27,6 +27,7 @@ module Luna
                 isNext = true
                 Pod::UserInterface.puts "请将二进制开关关闭，确保每个模块都是源码运行，因为二进制的因素有可能source缓存还是会引入二进制".yellow
                 command("rm -rf #{Dir.pwd}/Pods")
+
                 isNext = command("pod install")
                 Luna::Binary::Common.instance.deleteDirectory(binary_path_arm)
                 tempLunaUploaderPath = Luna::Binary::Common.instance.tempLunaUploaderPath
@@ -74,7 +75,8 @@ module Luna
     
             def mergeFrameWork(moduleName, path1, path2)
                 command("mkdir -p #{binary_path_merged}; cp -r #{File.dirname(path1)} #{binary_path_merged}; mv #{binary_path_merged}/#{File.basename(File.dirname(path1))} #{binary_path_merged}/#{moduleName};")
-                return command("lipo -create #{path2}/#{moduleName} #{path1}/#{moduleName} -output #{binary_path_merged}/#{moduleName}/#{moduleName}.framework/#{moduleName}")
+                command("lipo -create #{path2}/#{moduleName} #{path1}/#{moduleName} -output #{binary_path_merged}/#{moduleName}/#{moduleName}.framework/#{moduleName}")
+                command("cp -r #{path2}/Modules/#{moduleName}.swiftmodule  #{binary_path_merged}/#{moduleName}/#{moduleName}.framework/Modules")
             end
     
             def findFramework(moduleName, binary_path)

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

@@ -27,6 +27,7 @@ module Luna
                   end
                 }
                 if repoPath == nil
+                  p '没找到repo路径'
                   raise '没找到repo路径'  
                 end
                 return repoPath

data/lib/luna/binary/refresh.rb

@@ -21,15 +21,15 @@ module Luna
                             if pathArr != nil
                                 Pod::UserInterface.puts "#{pathArr.first} #{k}".yellow
                                 srcPath = File.dirname(pathArr.first)
-                                File.rename(srcPath, "#{rootPath}/#{k}")
-                                system "cp -r #{srcPath} #{rootPath}; "
+                                system "cp -r #{srcPath} #{rootPath};"
+                                File.rename("#{rootPath}/#{File.basename(srcPath)}", "#{rootPath}/#{k}")
                                 zipCommand = "cd #{rootPath};zip -r #{k}.zip #{k}"
                                 p zipCommand
                                 system zipCommand
-                                Luna::Binary::Delete.new(k,v).deleteBinaryFramework
-                                command = "cd #{rootPath};curl #{CBin.config.binary_upload_url} -F \"name=#{k}\" -F \"version=#{v}\" -F \"annotate=#{k}_#{v}_log\" -F \"file=@#{k}.zip\""
-                                p command 
-                                system command
+                                # Luna::Binary::Delete.new(k,v).deleteBinaryFramework
+                                # command = "cd #{rootPath};curl #{CBin.config.binary_upload_url} -F \"name=#{k}\" -F \"version=#{v}\" -F \"annotate=#{k}_#{v}_log\" -F \"file=@#{k}.zip\""
+                                # p command 
+                                # system command
                             end 
                         rescue => exception
                             p exception

data/lib/luna/binary/update.rb

@@ -41,7 +41,7 @@ module Luna
                                                     uploader = Luna::Binary::Uploader::SingleUploader.new(moduleName, "", "", binary_path)
                                                     uploader.specification=Pod::Specification.from_file(pathArr.first)
                                                     uploader.specificationWork
-                                                    localPathMapper[moduleName] = pathArr.first
+                                                    successList<<uploader
                                                 end
                                                 
                                             elsif gitURL && tag && !moduleName["/"]
@@ -75,6 +75,7 @@ module Luna
                 } 
 
                 successList.each { |item|
+                    Pod::UserInterface.puts "#{item} 制作中".yellow
                     item.upload
                 }
                 p "exception:#{failList}"

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

@@ -1,7 +1,7 @@
 module Luna
   module Binary
     module Uploader
-      VERSION = "0.1.8"
+      VERSION = "0.1.13"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luna-binary-uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.13
 platform: ruby
 authors:
 - 车德超
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake