luna-binary-uploader 0.1.12 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 055124f814326d00613b601e0b88cbe16a73ed1bb6ca590cf8ac8ff9cffcbf26
-  data.tar.gz: bc95cf8dedbed5fb05340f46b59fbea40c4452f61d3e39a8a8d8a16d828c8b88
+  metadata.gz: eabb8cf60ac1ae91b7f1bcdf005fd59b885ee60627307c4aa3ac0f6150c759b3
+  data.tar.gz: 04d6b4672865935bcc3d204e4b4657e6351ceaca39687f58909580fb45aeb179
 SHA512:
-  metadata.gz: a174a6779e8a4d5716dd891c0763f73d1998bb4023d654bef42e471d0d03ee8c27b8854dea88a7e20bf305820a5d0f3cecb6d8950c7961185c0a48b1fa3e50fa
-  data.tar.gz: da37682445afd5deca1c1384325ec517b87b95e2573b6d41118307762f01b4dac677e766b12a84300f88e6a206b9eed9d98f53b389ab249988a68fe9e3310157
+  metadata.gz: '0422488449593c2e144358cf2c98a116af7800675c8e6c97667120bca995a7eeaf9b3421f3fc5c1efa17c28efa82e733f66995ea397eee146da64d3f9de1bbb3'
+  data.tar.gz: 201e7660cfacc4d82ba60fb7d561de626e3841787ef5f122bce557a435213dd25ece50059d168e0cb98f9ab375f334b358b42ce58ea835416d0f662b5857856c

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,18 +94,40 @@ 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|
                   f.each_line do |item|
                       if item[":dev_env_use_binary"]
-                          matchs = item.match(/pod \'([\u4E00-\u9FA5A-Za-z0-9_-]+)\'/)
+                          matchs = item.match(/\'(?<=').*?(?=')\'/)
                           if matchs != nil
-                              list << matchs[1]
+                              list << matchs[0].gsub("'", "")
                           end
                       end
                   end
                 end
+              p "use_framework_list: #{list}"
               return list
             end
         end    

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

@@ -26,10 +26,10 @@ module Luna
                                 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
@@ -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.12"
+      VERSION = "0.1.16"
     end
   end
 end

metadata

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