luna-binary-uploader 0.1.11 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2be18823676fca9bb18233b751f1d371a60534c07e54caa1a14b72fb8c040e89
-  data.tar.gz: c81637d974e0d35cc8e9de5464618ff7198c055430b07599877c20f1b6102e00
+  metadata.gz: 1d529f4891c5824ed5c894073bbeec5d5668e875b54bff33d2ec84ce40279951
+  data.tar.gz: 298fe5853064bf24929dd43289415d4252e12e1448e08c10e665e0edc3e67870
 SHA512:
-  metadata.gz: 350e9c4a52c80b9f4aa77e589783c10c1a0240b1c0151ca87771d0478244af4109219a247b535804453c6bbb577f157738a72f57ab7d678afbebe4ff699634c1
-  data.tar.gz: cbcb31fa3171119886fce5a62f25643200a15ceb317e6c43e3e2d60cc009481f7ac051c86aa916369a34db4ddff30444309a855a990ea50b2bccd45dc4c53986
+  metadata.gz: 13a975f4a72a7b0991ae61347d75cada675ed8e9e26276a9499d55d5bbbc31c342115c924f2530c5e28900a688eeb8d107d8a5ddd595b656b52b8079a24a1c85
+  data.tar.gz: 23544e5512fbc4ea880afe1010c0f6fc37fae92a14a266f1e702368352cda6fb5a1bfd184ef07b71509ecc3c4958123e9f7bc8159e7eb03f372b9ad9da765038

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

@@ -94,6 +94,27 @@ module Luna
               @lockfile ||= Pod::Lockfile.from_file(podFilePath) if podFilePath.exist?
             end
 
+            def request_result_hash
+              command = "curl #{CBin.config.binary_upload_url}"
+              p command
+              result = %x(#{command})
+              request_result_hash = JSON.parse(result)
+              p request_result_hash
+              return request_result_hash
+          end
+          
+          def createNeedFrameworkMapper
+              spec_repo_binary = {}
+              Pod::UserInterface.puts "二进制repo地址 : #{CBin.config.binary_repo_url}".yellow
+              Luna::Binary::Common.instance.use_framework_list.each { |item|
+                  name = item.split('/').first
+                  if spec_repo_binary[name] == nil
+                      spec_repo_binary[name] = lockfile.version(name).version
+                  end
+              }    
+              return spec_repo_binary
+          end
+
             def use_framework_list
               list = []
               File.open(Dir.pwd+"/Podfile", 'r:utf-8') do  |f|

data/lib/luna/binary/delete.rb

@@ -41,7 +41,7 @@ module Luna
             end
 
             def deleteBinaryFramework 
-                command = "curl -X 'DELETE' #{CBin.config.binary_upload_url}/#{name}/#{version} -O -J"
+                command = "curl -X 'DELETE' #{CBin.config.binary_upload_url}/#{name}/#{version}"
                 p command 
                 system command
             end

data/lib/luna/binary/refresh.rb

@@ -21,8 +21,8 @@ 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
@@ -50,25 +50,13 @@ module Luna
 
             def request_result_hash
                 if @request_result_hash == nil
-                    command = "curl #{CBin.config.binary_upload_url}"
-                    p command
-                    result = %x(#{command})
-                    @request_result_hash = JSON.parse(result)
-                    p @request_result_hash
+                    @request_result_hash = Luna::Binary::Common.instance.request_result_hash
                 end
                 return @request_result_hash
             end
             
             def createNeedFrameworkMapper
-                spec_repo_binary = {}
-                Pod::UserInterface.puts "二进制repo地址 : #{CBin.config.binary_repo_url}".yellow
-                Luna::Binary::Common.instance.use_framework_list.each { |item|
-                    if spec_repo_binary[item] == nil && item["/"] == nil
-                        name = item.split('/').first
-                        spec_repo_binary[name] = lockfile.version(name).version
-                    end
-                }    
-                return spec_repo_binary
+                return Luna::Binary::Common.instance.createNeedFrameworkMapper
             end
         end 
     end

data/lib/luna/binary/update.rb

@@ -104,25 +104,13 @@ module Luna
 
             def request_result_hash
                 if @request_result_hash == nil
-                    command = "curl #{CBin.config.binary_upload_url}"
-                    p command
-                    result = %x(#{command})
-                    @request_result_hash = JSON.parse(result)
-                    p @request_result_hash
+                    @request_result_hash = Luna::Binary::Common.instance.request_result_hash
                 end
                 return @request_result_hash
             end
             
             def createNeedFrameworkMapper
-                spec_repo_binary = {}
-                Pod::UserInterface.puts "二进制repo地址 : #{CBin.config.binary_repo_url}".yellow
-                Luna::Binary::Common.instance.use_framework_list.each { |item|
-                    if spec_repo_binary[item] == nil && item["/"] == nil
-                        name = item.split('/').first
-                        spec_repo_binary[name] = lockfile.version(name).version
-                    end
-                }    
-                return spec_repo_binary
+                return Luna::Binary::Common.instance.createNeedFrameworkMapper
             end
         end 
     end

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

@@ -1,7 +1,7 @@
 module Luna
   module Binary
     module Uploader
-      VERSION = "0.1.11"
+      VERSION = "0.1.15"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luna-binary-uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.15
 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