luna-binary-uploader 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eabb8cf60ac1ae91b7f1bcdf005fd59b885ee60627307c4aa3ac0f6150c759b3
-  data.tar.gz: 04d6b4672865935bcc3d204e4b4657e6351ceaca39687f58909580fb45aeb179
+  metadata.gz: 5d663fbfaa88152aedca42571e25b0b406f606f8d891c2e425ea5b94f726113d
+  data.tar.gz: dc877ae8656c5fd30f93f1e3d273e5b3652b6ed4cd654da9030c314353e56aa2
 SHA512:
-  metadata.gz: '0422488449593c2e144358cf2c98a116af7800675c8e6c97667120bca995a7eeaf9b3421f3fc5c1efa17c28efa82e733f66995ea397eee146da64d3f9de1bbb3'
-  data.tar.gz: 201e7660cfacc4d82ba60fb7d561de626e3841787ef5f122bce557a435213dd25ece50059d168e0cb98f9ab375f334b358b42ce58ea835416d0f662b5857856c
+  metadata.gz: 47d554b5f86b1562d277a923dc363fe5ed0e22191d5f65f9aa26034a7bdc9ab35f4a9ca4a1bb0a42555a7f71256620b8286fc8aa51b9e592fec10b0a6df6ae73
+  data.tar.gz: 7d6c49478e2a77cd2fadd69025335fbe1c9600d786efa4a23c23455537940d31db9e3c413b8c5138fb7b0ba8766b0ef07b60a0c779ea6cbd5bc57c6ac6e7eb4f

data/.gitignore

@@ -6,7 +6,6 @@
 /pkg/
 /spec/reports/
 /tmp/
-Gemfile.lock
 Podfile
 Podfile.lock
 temp-luna-uploader/

data/Gemfile.lock

@@ -0,0 +1,174 @@
+PATH
+  remote: .
+  specs:
+    luna-binary-uploader (0.1.17)
+      cocoapods
+      cocoapods-generate (~> 2.0.1)
+      cocoapods-imy-bin (= 0.3.1.3)
+      gli (= 2.19.0)
+      parallel
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.4)
+      rexml
+    activesupport (6.1.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    aruba (2.0.0)
+      bundler (>= 1.17, < 3.0)
+      childprocess (>= 2.0, < 5.0)
+      contracts (>= 0.16.0, < 0.18.0)
+      cucumber (>= 4.0, < 8.0)
+      rspec-expectations (~> 3.4)
+      thor (~> 1.0)
+    atomos (0.1.3)
+    builder (3.2.4)
+    childprocess (4.1.0)
+    claide (1.0.3)
+    cocoapods (1.11.2)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.11.2)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.8.0)
+      nap (~> 1.0)
+      ruby-macho (>= 1.0, < 3.0)
+      xcodeproj (>= 1.21.0, < 2.0)
+    cocoapods-core (1.11.2)
+      activesupport (>= 5.0, < 7)
+      addressable (~> 2.8)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix (~> 4.0)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-disable-podfile-validations (0.1.1)
+    cocoapods-downloader (1.5.1)
+    cocoapods-generate (2.0.1)
+      cocoapods-disable-podfile-validations (~> 0.1.1)
+    cocoapods-imy-bin (0.3.1.3)
+      cocoapods
+      cocoapods-generate (~> 2.0.0)
+      parallel
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
+    colored2 (3.1.2)
+    concurrent-ruby (1.1.9)
+    contracts (0.16.1)
+    cucumber (7.1.0)
+      builder (~> 3.2, >= 3.2.4)
+      cucumber-core (~> 10.1, >= 10.1.0)
+      cucumber-create-meta (~> 6.0, >= 6.0.1)
+      cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
+      cucumber-gherkin (~> 22.0, >= 22.0.0)
+      cucumber-html-formatter (~> 17.0, >= 17.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      cucumber-wire (~> 6.2, >= 6.2.0)
+      diff-lcs (~> 1.4, >= 1.4.4)
+      mime-types (~> 3.3, >= 3.3.1)
+      multi_test (~> 0.1, >= 0.1.2)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-core (10.1.0)
+      cucumber-gherkin (~> 22.0, >= 22.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      cucumber-tag-expressions (~> 4.0, >= 4.0.2)
+    cucumber-create-meta (6.0.2)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-cucumber-expressions (14.0.0)
+    cucumber-gherkin (22.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+    cucumber-html-formatter (17.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.0)
+    cucumber-messages (17.1.1)
+    cucumber-tag-expressions (4.1.0)
+    cucumber-wire (6.2.0)
+      cucumber-core (~> 10.1, >= 10.1.0)
+      cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+    diff-lcs (1.4.4)
+    escape (0.0.4)
+    ethon (0.15.0)
+      ffi (>= 1.15.0)
+    ffi (1.15.4)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    gli (2.19.0)
+    httpclient (2.8.3)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    json (2.6.0)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2021.0901)
+    minitest (5.14.4)
+    molinillo (0.8.0)
+    multi_test (0.1.2)
+    nanaimo (0.3.0)
+    nap (1.1.0)
+    netrc (0.11.0)
+    parallel (1.21.0)
+    public_suffix (4.0.6)
+    rake (12.3.3)
+    rdoc (6.3.2)
+    rexml (3.2.5)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    ruby-macho (2.5.1)
+    sys-uname (1.2.2)
+      ffi (~> 1.1)
+    thor (1.1.0)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    xcodeproj (1.21.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+    zeitwerk (2.5.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aruba
+  luna-binary-uploader!
+  rake (~> 12.0)
+  rdoc
+
+BUNDLED WITH
+   2.1.4

data/bin/lbu

@@ -7,6 +7,8 @@ require "luna/binary/analysis"
 require "luna/binary/refresh"
 require "luna/binary/build"
 require "luna/binary/update"
+require "luna/binary/install"
+require "luna/binary/init"
 require 'gli'
 
 # You can add fixtures and/or initialization code here to make experimenting
@@ -54,6 +56,33 @@ class App
       end
     end
   
+    desc '初始化二进制配置repo代码'
+    arg_name 'url地址'
+    command :init do |c|
+      c.action do |global_options,options,args|
+        if args[0]
+          Luna::Binary::Init.new(args[0])
+        else
+          raise "添加url地址"
+        end
+      end
+    end
+
+
+    desc '对pod install封装，一键开关二进制'
+    arg_name '只接参数n, 表示不用二进制 '
+    command :install do |c|
+      c.action do |global_options,options,args|
+        is_open = "false"
+        if args[0] && args[0] != "n"
+          raise "只接参数n, 表示不用二进制"
+        else
+          is_open = "true"
+        end
+        Luna::Binary::Install.new(is_open)     
+      end
+    end
+
     desc '单个上传二进制文件'
     arg_name '1.模块名 git地址 git节点 xcode编译的缓存地址 \n 2.模块名 版本号 xcode编译的缓存地址 \n 3.模块名 本地podspec地址 xcode编译的缓存地址'
     command :single do |c|

data/lib/luna/binary/analysis.rb

@@ -31,77 +31,47 @@ module Luna
         end
 
         def run
-            
             failList = []
             successList = []
-            localPathMapper = {}
     
-            dependenciesMapper = lockfile.dependencies.map { |item| [item.name, item]}.to_h
+            dependenciesMapper = Luna::Binary::Common.instance.dependenciesMapper
             dedupingMapper = {}
             lockfile.pod_names.each { |item|
                     moduleName = item.split('/').first
                     if !moduleName["/"] && dedupingMapper[moduleName] == nil
                         dedupingMapper[moduleName] = moduleName
-                        Pod::UserInterface.puts moduleName.yellow
-                        if dependenciesMapper[moduleName]
-                            lockContent = lockfile.dependencies_to_lock_pod_named(moduleName)
-                            if lockContent  #dependencies 应该拿不到所有的spec的依赖，我理解只能拿到podfile里面标明的,词典碰到dependency 没有bonmot的情况
-                                lockContent.each { |lockItem|
-                                    begin
-                                        if lockItem.external_source == nil
-                                            uploader = uploadLintPodSpec(moduleName, lockItem.specific_version, binary_path) 
-                                            if uploader != nil
-                                                successList << uploader
-                                            end
-                                        else 
-                                            p lockItem.external_source
-                                            gitURL = lockItem.external_source['git'.parameterize.underscore.to_sym]
-                                            tag = lockItem.external_source['tag'.parameterize.underscore.to_sym]
-                                            path = lockItem.external_source['path'.parameterize.underscore.to_sym]
-                                            p "#{moduleName} git: #{gitURL} tag: #{tag} path: #{path}"
-                                            if path
-                                                pathArr = Dir.glob("#{Dir.pwd}/#{path}/**/#{moduleName}.podspec")
-                                                if pathArr 
-                                                    uploader = Luna::Binary::Uploader::SingleUploader.new(moduleName, "", "", binary_path)
-                                                    uploader.specification=Pod::Specification.from_file(pathArr.first)
-                                                    uploader.specificationWork
-                                                    localPathMapper[moduleName] = pathArr.first
-                                                end
-                                                
-                                            elsif gitURL && tag && !moduleName["/"]
-                                                uploader = Luna::Binary::Uploader::SingleUploader.new(moduleName, gitURL, tag, binary_path)
-                                                uploader.specificationWork
-                                                successList << uploader
-                                            end
-                                        end
-                                    rescue => exception
-                                        failList << exception
-                                    ensure
-                                        
-                                    end
-                                }   
-                            end
-                        else
-                            begin
-                                uploader = uploadLintPodSpec(moduleName, lockfile.version(moduleName), binary_path) 
-                                if uploader != nil
-                                    successList << uploader
-                                end
-                            rescue => exception
-                                failList << exception
-                            ensure
-                                
+                        puts moduleName.yellow
+                        begin
+                            uploader = Luna::Binary::Common.instance.upload_lockitem(dependenciesMapper, moduleName, binary_path)
+                            if uploader != nil
+                                successList << uploader
+                            else
+                                failList << "#{moduleName} 为空"
                             end
+                            
+                        rescue => exception
+                            failList << "#{moduleName} exception: #{exception}"
+                        ensure
+                            
                         end
                     end
             }
-            p "-=-=-=-=-=-=-=-=-=-=-=-命令生成=-=-=-=-=-=-=-=-=-=-=-=-=-="
+            puts "-=-=-=-=-=-=-=-=-=-=-=-打印错误信息=-=-=-=-=-=-=-=-=-=-=-=-=-=".yellow if failList.length > 0
+            puts "请查看下时候存在影响，如怀疑程序错误请联系作者".yellow if failList.length > 0
+            failList.each{ |item|
+                puts item.red
+            }
+
+            puts "-=-=-=-=-=-=-=-=-=-=-=-命令生成=-=-=-=-=-=-=-=-=-=-=-=-=-=".yellow
             hasInCocopodsSpec = []
             externalSpec = []
+            local_spec = []
             failPrint = []
         
             successList.each { |item|
-                if item.gitUrl.length > 0
+                if item.local_path
+                    local_spec << item
+                elsif item.gitUrl.length > 0
                     externalSpec << item
                 else
                     hasInCocopodsSpec << item
@@ -111,8 +81,7 @@ module Luna
                 begin
                     item.printPreUploadCommand
                 rescue => exception
-                    # p exception
-                    failPrint << "#{exception}"
+                    failPrint << "#{item.podspecName} exception: #{exception}"
                 ensure
                     
                 end   
@@ -121,52 +90,45 @@ module Luna
                 begin
                     item.printPreUploadCommand
                 rescue => exception
-                    # p exception
-                    failPrint << "#{exception}"
+                    failPrint << "#{item.podspecName} exception: #{exception}"
                 ensure
                     
                 end 
             }
 
-            localPathMapper.each { |k,v|
-                p "lbu single #{k} #{v} #{binary_path}"
+            local_spec.each { |item|
+                begin
+                    item.printPreUploadCommand
+                rescue => exception
+                    failPrint << "#{item.podspecName} exception: #{exception}"
+                ensure
+                    
+                end 
             }
 
-            p "-=-=-=-=-=-=-=-=-=-=-=-命令生成end=-=-=-=-=-=-=-=-=-=-=-=-=-="
-            p "错误信息:#{failPrint}"
-            execUpload(hasInCocopodsSpec)
-            execUpload(externalSpec)
-        end
+            puts "-=-=-=-=-=-=-=-=-=-=-=-命令生成end=-=-=-=-=-=-=-=-=-=-=-=-=-=".yellow
 
-        def findLintPodspec(moduleName)
-            return Luna::Binary::Common.instance.findLintPodspec(moduleName) 
-        end
+            failPrint.each{ |item|
+                puts item.red
+            }
 
-        def uploadLintPodSpec(moduleName, specificVersion, binaryPath) 
-            set = findLintPodspec(moduleName)
-            if set 
-                pathArr = set.specification_paths_for_version(specificVersion)
-                if pathArr.length > 0
-                    uploader = Luna::Binary::Uploader::SingleUploader.new(moduleName, "", "", binaryPath)
-                    uploader.specification=Pod::Specification.from_file(pathArr.first)
-                    uploader.specificationWork
-                end
-            end
-            return uploader
+            execUpload(successList)
         end
-
+        
         def execUpload(items)
             if need_upload != nil && need_upload == "upload"
+                puts "-=-=-=-=-=-=-=-=-=-=-=-开始上传=-=-=-=-=-=-=-=-=-=-=-=-=-=".yellow
                 items.each { |item|
                     begin
                         item.upload
                     rescue => exception
-                        p "异常上传过程中出现了:#{exception}"
+                        puts "异常上传过程中出现了:#{exception}".red
                     else
                         
                     end
                     
                 }
+                puts "-=-=-=-=-=-=-=-=-=-=-=-上传结束=-=-=-=-=-=-=-=-=-=-=-=-=-=".yellow
             end
         end
 

data/lib/luna/binary/build.rb

@@ -25,17 +25,17 @@ module Luna
 
             def createFrameworks
                 isNext = true
-                Pod::UserInterface.puts "请将二进制开关关闭，确保每个模块都是源码运行，因为二进制的因素有可能source缓存还是会引入二进制".yellow
+                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
                 isNext = command("xcodebuild -workspace #{workspace} -scheme #{scheme} -configuration Debug -derivedDataPath '#{tempLunaUploaderPath}/build/arm/temp'") if isNext == true
-                isNext = command("cp -r #{tempLunaUploaderPath}/build/arm/temp/Build/Products #{binary_path_arm}") if isNext == true #本可以用CONFIGURATION_BUILD_DIR直接指定结果文件夹，结果经常性的编译报错
+                isNext = command("cp -r #{tempLunaUploaderPath}/build/arm/temp/Build/Products/Debug-iphoneos #{binary_path_arm}") if isNext == true #本可以用CONFIGURATION_BUILD_DIR直接指定结果文件夹，结果经常性的编译报错
                 Luna::Binary::Common.instance.deleteDirectory(binary_path_x86)
                 isNext = command("xcodebuild -workspace #{workspace} -scheme #{scheme} -configuration Debug -derivedDataPath '#{tempLunaUploaderPath}/build/x86/temp' -destination 'platform=iOS Simulator,name=iPhone 11'") if isNext == true
-                isNext = command("cp -r #{tempLunaUploaderPath}/build/x86/temp/Build/Products #{binary_path_x86}") if isNext == true
+                isNext = command("cp -r #{tempLunaUploaderPath}/build/x86/temp/Build/Products/Debug-iphonesimulator #{binary_path_x86}") if isNext == true
                 mergeFrameWorks(binary_path_arm, binary_path_x86) if isNext == true
             end
     
@@ -43,13 +43,19 @@ module Luna
                 Luna::Binary::Common.instance.deleteDirectory(binary_path_merged)
                 dedupingMapper = {}
                 failList = []
-                lockfile.pod_names.each { |item|
-                    if item["/"] == nil && dedupingMapper[item] == nil
+                p lockfile.pod_names
+                lockfile.pod_names.each { |i|
+                    item = i.split("/").first
+                    if dedupingMapper[item] == nil
                         begin
-                            Pod::UserInterface.puts item.yellow
+                            puts item.yellow
                             armPath = findFramework(item,binary_path_arm)
                             x86Path = findFramework(item,binary_path_x86)
-                            mergeFrameWork(item, armPath, x86Path) if armPath != nil && x86Path != nil
+
+                            is_merge = mergeFrameWork(item, armPath, x86Path) if armPath != nil && x86Path != nil
+                            trasher_path = "#{Common.instance.tempLunaUploaderPath}/trasher"
+                            failList << "#{item} 存在问题，已搬到#{trasher_path}" if is_merge == false
+                            command("mkdir #{trasher_path}; mv #{binary_path_merged}/#{item} #{trasher_path}") if is_merge == false
                             dedupingMapper[item] = item
                         rescue => exception
                             failList << "#{item} exception : #{exception}"
@@ -60,8 +66,11 @@ module Luna
                     end 
                 }
                 
-                Pod::UserInterface.puts "合并后的framework的路径为:#{binary_path_merged}".yellow
-                Pod::UserInterface.puts "失败的名单为:#{failList}".yellow
+                puts "合并后的framework的路径为:#{binary_path_merged}".green
+                puts "-=-=-=-=-=-=-=-=merge 失败名单-=-=-=-=-=-=-=-=-=-=" if failList.length > 0
+                failList.each { |item|
+                    puts item.red
+                }
             end
 
             def lockfile
@@ -74,9 +83,9 @@ module Luna
             end
     
             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};")
-                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")
+                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("-", "_")
+                return command("lipo -create #{path2}/#{framework_name} #{path1}/#{framework_name} -output #{binary_path_merged}/#{moduleName}/#{framework_name}.framework/#{framework_name}")
             end
     
             def findFramework(moduleName, binary_path)

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

@@ -105,31 +105,115 @@ module Luna
           
           def createNeedFrameworkMapper
               spec_repo_binary = {}
-              Pod::UserInterface.puts "二进制repo地址 : #{CBin.config.binary_repo_url}".yellow
-              Luna::Binary::Common.instance.use_framework_list.each { |item|
+              puts "二进制repo地址 : #{CBin.config.binary_repo_url}".yellow
+              use_framework_list.each { |item|
                   name = item.split('/').first
                   if spec_repo_binary[name] == nil
                       spec_repo_binary[name] = lockfile.version(name).version
                   end
               }    
+              p "use_framework_list: #{spec_repo_binary}"
               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(/\'(?<=').*?(?=')\'/)
-                          if matchs != nil
-                              list << matchs[0].gsub("'", "")
+          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(/\'(?<=').*?(?=')\'/)
+                        if matchs != nil
+                            list << matchs[0].gsub("'", "")
+                        end
+                    end
+                end
+              end
+            return list
+          end
+
+          def create_upload_lockitem(lockItem, moduleName, binary_path)
+            if lockItem.external_source == nil
+              uploader = uploadLintPodSpec(moduleName, lockItem.specific_version, binary_path) 
+              if uploader != nil
+                  return uploader
+              end
+            else 
+              p lockItem.external_source
+              gitURL = lockItem.external_source['git'.parameterize.underscore.to_sym]
+              tag = lockItem.external_source['tag'.parameterize.underscore.to_sym]
+              path = lockItem.external_source['path'.parameterize.underscore.to_sym]
+              p "#{moduleName} git: #{gitURL} tag: #{tag} path: #{path}"
+              if path
+                  pathArr = Dir.glob("#{Dir.pwd}/#{path}/**/#{moduleName}.podspec")
+                  if pathArr 
+                      uploader = Uploader::SingleUploader.new(moduleName, "", "", binary_path)
+                      uploader.local_path = pathArr.first
+                      return uploader
+                  end
+                  
+              elsif gitURL && tag && !moduleName["/"]
+                  uploader = Uploader::SingleUploader.new(moduleName, gitURL, tag, binary_path)
+                  return uploader
+              end
+            end
+          end
+
+          def upload_lockitem(dependencies_mapper, moduleName, binary_path, is_refresh = false)
+            if dependencies_mapper[moduleName]
+              lockContent = lockfile.dependencies_to_lock_pod_named(moduleName)
+              if lockContent  #dependencies 应该拿不到所有的spec的依赖，我理解只能拿到podfile里面标明的,词典碰到dependency 没有bonmot的情况
+                  lockContent.each { |lockItem|
+                      begin
+                          loader = create_upload_lockitem(lockItem, moduleName, binary_path)
+                          if is_refresh
+                            loader.refresh_specification_work
+                          else
+                            loader.specificationWork
                           end
+                          return loader
+                      rescue => exception
+                          raise exception
+                      ensure
+
                       end
-                  end
+                  }   
+              end
+            else
+                begin
+                    uploader = uploadLintPodSpec(moduleName, lockfile.version(moduleName), binary_path) 
+                    if uploader != nil
+                        if is_refresh
+                          uploader.refresh_specification_work
+                        else
+                          uploader.specificationWork
+                        end
+                        return uploader
+                    end
+                rescue => exception
+                  raise exception
+                ensure
+
+                end
+            end
+          end
+
+          def uploadLintPodSpec(moduleName, specificVersion, binaryPath) 
+            set = findLintPodspec(moduleName)
+            if set 
+                pathArr = set.specification_paths_for_version(specificVersion)
+                if pathArr.length > 0
+                    uploader = Uploader::SingleUploader.new(moduleName, "", "", binaryPath)
+                    uploader.specification=Pod::Specification.from_file(pathArr.first)
+                    # uploader.specificationWork
                 end
-              p "use_framework_list: #{list}"
-              return list
             end
+            return uploader
+          end
+
+          def dependenciesMapper
+            return lockfile.dependencies.map { |item| [item.name.split("/").first, item]}.to_h
+          end
+
         end    
     end
 end

data/lib/luna/binary/init.rb

@@ -0,0 +1,25 @@
+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
+    module Binary
+        class Init
+            attr_reader :url
+            def initialize(url)
+                @url = url
+                run
+            end
+
+            def run
+                 Common.instance.command("curl -o #{Pod::Config.instance.home_dir}/bin_dev.yml #{url}")
+                 Common.instance.command("pod repo add z-ios-framework-spec-repo #{CBin.config.binary_repo_url}")
+            end
+
+        end
+    end
+end

data/lib/luna/binary/install.rb

@@ -0,0 +1,38 @@
+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
+    module Binary
+        class Install
+            attr_reader :is_open
+            def initialize(is_open)
+                @is_open = is_open
+                run
+            end
+
+            def run
+                buffer = ""
+                podfile_path = Dir.pwd + "/Podfile"
+                IO.foreach(podfile_path) { |line|
+                    if line.match(/@use_luna_frameworks =/)  || line.match(/@use_luna_frameworks=/)
+                        buffer += "@use_luna_frameworks = #{is_open}\n"
+                    else
+                        buffer += line
+                    end
+                }   
+                File.open(podfile_path, "w") { |source_file|
+                    source_file.write buffer
+                }
+
+                Common.instance.command("rm -rf #{Dir.pwd}/Pods")
+                Common.instance.command("pod install")
+
+            end
+        end
+    end
+end

data/lib/luna/binary/refresh.rb

@@ -9,39 +9,51 @@ module Luna
             attr_accessor :request_result_hash
 
             def run 
-                spec_repo_binary = createNeedFrameworkMapper
-                rootPath = "#{Luna::Binary::Common.instance.tempLunaUploaderPath}/refresh"
-                Luna::Binary::Common.instance.deleteDirectory("#{rootPath}")
-                system "mkdir -p #{rootPath};"
+                spec_repo_binary = Luna::Binary::Common.instance.createNeedFrameworkMapper
+                dependencies_mapper = Luna::Binary::Common.instance.dependenciesMapper
                 failList = []
+                successList = []
                 spec_repo_binary.each { |k,v|
                     if request_result_hash[k] != nil && request_result_hash[k].include?(v)
                         begin
-                            pathArr = Dir.glob("#{binary_path}/**/#{k.sub("-","_")}.framework")
-                            if pathArr != nil
-                                Pod::UserInterface.puts "#{pathArr.first} #{k}".yellow
-                                srcPath = File.dirname(pathArr.first)
-                                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
-                            end 
+                            puts "#{k} #{v}".yellow
+                            
+                            uploader = Luna::Binary::Common.instance.upload_lockitem(dependencies_mapper,k ,binary_path, true)
+                            if uploader != nil
+                                Luna::Binary::Delete.new(k,v).delete
+                                puts "#{k} #{v} 重新制作上传".yellow
+                                uploader.upload
+                                successList << "#{k} #{v}"
+                            else
+                                failList << "#{k} #{v} 失败，请确保在非二进制状态下"
+                            end
+        
                         rescue => exception
-                            p exception
-                            failList << "#{k} #{exception}"
-                        else
+                            failList << "#{k} #{v} exception:#{exception}"
+                        ensure
                             
-                        end
+                        end                        
                     else   
-                      failList << "name: #{k}"
+                      failList << "name: #{k} #{v} 在服务不存在"
                     end 
                 } 
-                p "exception:#{failList}"
+                puts "-=-=-=-=-=-=-=-=重新上传的名单-=-=-=-=-=-=-=-=".yellow
+                successList.each { |item|
+                    puts item.green
+                }
+
+                puts "-=-=-=-=-=-=-=-=失败的名单-=-=-=-=-=-=-=-=".yellow if failList.length > 0
+                failList.each { |item|
+                    puts item.red
+                }
+            end
+
+            def in_framework_service(dependencies_mapper, name, version)
+                 dependency = dependencies_mapper[name]
+                if lockfile.dependencies_mappe
+                else
+                    
+                end
             end
 
             def lockfile 
@@ -54,10 +66,7 @@ module Luna
                 end
                 return @request_result_hash
             end
-            
-            def createNeedFrameworkMapper
-                return Luna::Binary::Common.instance.createNeedFrameworkMapper
-            end
+        
         end 
     end
 end

data/lib/luna/binary/update.rb

@@ -9,109 +9,49 @@ module Luna
             attr_accessor :request_result_hash
 
             def run 
-                spec_repo_binary = createNeedFrameworkMapper
-                rootPath = "#{Luna::Binary::Common.instance.tempLunaUploaderPath}/update"
-                Luna::Binary::Common.instance.deleteDirectory("#{rootPath}")
-                system "mkdir -p #{rootPath};"
+                spec_repo_binary = Common.instance.createNeedFrameworkMapper
                 failList = []
                 successList = []
-                dependenciesMapper = lockfile.dependencies.map { |item| [item.name, item]}.to_h
+                dependenciesMapper = Common.instance.dependenciesMapper
                 spec_repo_binary.each { |k,v|
                     if request_result_hash[k] == nil || request_result_hash[k].include?(v) == false
-                        moduleName = k
-                        if dependenciesMapper[moduleName]
-                            lockContent = lockfile.dependencies_to_lock_pod_named(moduleName)
-                            if lockContent  #dependencies 应该拿不到所有的spec的依赖，我理解只能拿到podfile里面标明的,词典碰到dependency 没有bonmot的情况
-                                lockContent.each { |lockItem|
-                                    begin
-                                        if lockItem.external_source == nil
-                                            uploader = uploadLintPodSpec(moduleName, lockItem.specific_version, binary_path) 
-                                            if uploader != nil
-                                                successList << uploader
-                                            end
-                                        else 
-                                            p lockItem.external_source
-                                            gitURL = lockItem.external_source['git'.parameterize.underscore.to_sym]
-                                            tag = lockItem.external_source['tag'.parameterize.underscore.to_sym]
-                                            path = lockItem.external_source['path'.parameterize.underscore.to_sym]
-                                            p "#{moduleName} git: #{gitURL} tag: #{tag} path: #{path}"
-                                            if path
-                                                pathArr = Dir.glob("#{Dir.pwd}/#{path}/**/#{moduleName}.podspec")
-                                                if pathArr 
-                                                    uploader = Luna::Binary::Uploader::SingleUploader.new(moduleName, "", "", binary_path)
-                                                    uploader.specification=Pod::Specification.from_file(pathArr.first)
-                                                    uploader.specificationWork
-                                                    successList<<uploader
-                                                end
-                                                
-                                            elsif gitURL && tag && !moduleName["/"]
-                                                uploader = Luna::Binary::Uploader::SingleUploader.new(moduleName, gitURL, tag, binary_path)
-                                                uploader.specificationWork
-                                                successList << uploader
-                                            end
-                                        end
-                                    rescue => exception
-                                        # raise exception
-                                    ensure
-                                        
-                                    end
-                                }   
-                            end
-                        else
-                            begin
-                                uploader = uploadLintPodSpec(moduleName, lockfile.version(moduleName), binary_path) 
-                                if uploader != nil
-                                    successList << uploader
-                                end
-                            rescue => exception
-                              
-                            ensure
-                                
+                        begin
+                            uploader = Common.instance.upload_lockitem(dependenciesMapper, k, binary_path)
+                            if uploader != nil
+                                successList << uploader
+                            else
+                                failList << "#{k} #{v} 失败，请确保在非二进制状态下"
                             end
+                            
+                        rescue => exception
+                            failList << "#{k} exception: #{exception}"
+                        ensure
+                            
                         end
                     else   
                       failList << "已存在name: #{k}"
                     end 
                 } 
-
+                puts "-=-=-=-=-=-=-=-=framework制作中-=-=-=-=-=-=-=-=-=-=".yellow
                 successList.each { |item|
-                    Pod::UserInterface.puts "#{item} 制作中".yellow
+                    puts "#{item} 制作中".yellow
                     item.upload
                 }
-                p "exception:#{failList}"
-            end
 
-            def lockfile 
-                return Luna::Binary::Common.instance.lockfile
-            end
+                puts "-=-=-=-=-=-=-=-=update 失败名单-=-=-=-=-=-=-=-=-=-=".yellow if failList.length > 0
+                failList.each {|item|
+                    puts item.red
+                }
 
-            def findLintPodspec(moduleName)
-                return Luna::Binary::Common.instance.findLintPodspec(moduleName) 
-            end
-    
-            def uploadLintPodSpec(moduleName, specificVersion, binaryPath) 
-                set = findLintPodspec(moduleName)
-                if set 
-                    pathArr = set.specification_paths_for_version(specificVersion)
-                    if pathArr.length > 0
-                        uploader = Luna::Binary::Uploader::SingleUploader.new(moduleName, "", "", binaryPath)
-                        uploader.specification=Pod::Specification.from_file(pathArr.first)
-                        uploader.specificationWork
-                    end
-                end
-                return uploader
             end
 
             def request_result_hash
                 if @request_result_hash == nil
-                    @request_result_hash = Luna::Binary::Common.instance.request_result_hash
+                    @request_result_hash = Common.instance.request_result_hash
                 end
                 return @request_result_hash
             end
-            
-            def createNeedFrameworkMapper
-                return Luna::Binary::Common.instance.createNeedFrameworkMapper
-            end
+
         end 
     end
 end

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

@@ -1,7 +1,7 @@
 module Luna
   module Binary
     module Uploader
-      VERSION = "0.1.16"
+      VERSION = "0.1.17"
     end
   end
 end

data/lib/luna/binary/uploader.rb

@@ -18,13 +18,14 @@ module Luna
         attr_reader :rootName
         attr_reader :podspecName
         attr_accessor :specification
+        attr_accessor :local_path
 
         def initialize(podspecName, gitUrl, gitNode, binaryPath)
           @podspecName = podspecName
           @gitUrl = gitUrl
           @gitNode = gitNode
           @binaryPath = binaryPath
-          @rootName = Luna::Binary::Common.instance.tempLunaUploaderPath + "/#{podspecName}/"
+          @rootName = Common.instance.tempLunaUploaderPath + "/temp/#{podspecName}/"
           validate!
         end
 
@@ -44,9 +45,16 @@ module Luna
           if @specification != nil
             return @specification
           end
-          puts "#{rootName + "**/#{podspecName}.podspec"}"
-          podspecPathArr =  Dir.glob(rootName + "**/#{podspecName}.podspec")
-          puts "#{podspecPathArr}"
+          if local_path 
+            puts "#{local_path}"
+            podspecPathArr =  Dir.glob(local_path)
+            puts "#{podspecPathArr}"
+          else
+            puts "#{rootName + "**/#{podspecName}.podspec"}"
+            podspecPathArr =  Dir.glob(rootName + "**/#{podspecName}.podspec")
+            puts "#{podspecPathArr}"
+          end
+         
           if podspecPathArr.length == 1
             podspecPath = podspecPathArr[0]
             p "模块路径为" + podspecPath
@@ -63,11 +71,7 @@ module Luna
           rescue => exception
           
           ensure
-            if gitUrl && gitUrl.length > 0
-              command = "git clone #{gitUrl} #{@rootName}temp; cd #{@rootName}temp; git fetch --all;git stash; git checkout #{gitNode};"
-              p command
-              result = system command
-            end
+            download_git
             
             if isHasSpecInRepo == false && isHasFrameworkInService == false
               @spec = createFrameworkSpec
@@ -78,6 +82,31 @@ module Luna
           end
         end
 
+        def refresh_specification_work
+          begin
+            clearTempFile
+          rescue => exception
+          
+          ensure
+            download_git
+            
+            if isHasSpecInRepo == true && isHasFrameworkInService == true
+              @spec = createFrameworkSpec
+              write_spec_file(@spec)
+            else
+              raise "repo or 二进制服务 不存在 #{specification.name} #{specification.version}"
+            end
+          end
+        end
+
+        def download_git
+          command("git clone #{gitUrl} #{@rootName}temp; cd #{@rootName}temp; git fetch --all;git stash; git checkout #{gitNode};") if gitUrl && gitUrl.length > 0
+        end
+
+        def command(c)
+          return Common.instance.command(c)
+        end
+
         def push
           if isLocalHasFramework && isLocalHasPodSpec 
             pushRepo
@@ -88,11 +117,13 @@ module Luna
         end
 
         def printPreUploadCommand
-          if isLocalHasFramework && isLocalHasPodSpec 
-            if gitUrl && gitUrl.length == 0
-              Pod::UserInterface.puts "lbu single #{podspecName} #{specification.version} #{binaryPath}"  
+          if isLocalHasFramework && isLocalHasPodSpec
+            if local_path
+              puts "lbu single #{podspecName} #{local_path} #{binaryPath}".green  
+            elsif gitUrl && gitUrl.length == 0
+              puts "lbu single #{podspecName} #{specification.version} #{binaryPath}" .green   
             else
-              Pod::UserInterface.puts "lbu single #{podspecName} #{gitUrl} #{gitNode} #{binaryPath}"
+              puts "lbu single #{podspecName} #{gitUrl} #{gitNode} #{binaryPath}".green  
             end
           else
             raise "#{specification.name} #{specification.version} repo或framework缺失"
@@ -140,7 +171,7 @@ module Luna
           bundlePaths = Dir.glob("#{binaryPath}/**/#{specification.root.name}.bundle")
           if bundlePaths.length > 1
             # raise "findBundle:#{bundlePaths},不知道取哪个" 
-            Pod::UserInterface.puts "findBundle:#{bundlePaths},不知道取哪个，做合并"
+            puts "findBundle:#{bundlePaths},不知道取哪个，做合并"
           end
           bundlePaths.each { |item|
             system "cp -r #{item} #{moduleDirPath}"
@@ -333,7 +364,7 @@ module Luna
 
         
         def repoPath
-          return Luna::Binary::Common.instance.repoPath
+          return Common.instance.repoPath
         end
 
         def isHasSpecInRepo
@@ -382,17 +413,17 @@ module Luna
         def clearTempFile
           p rootName
           begin
-            Luna::Binary::Common.instance.deleteDirectory("#{rootName}bin-json") 
+            Common.instance.deleteDirectory("#{rootName}bin-json") 
           rescue => exception
             
           ensure
             begin
-              Luna::Binary::Common.instance.deleteDirectory("#{rootName}#{podspecName}.zip")
+              Common.instance.deleteDirectory("#{rootName}#{podspecName}.zip")
             rescue => exception
               
             ensure
               begin
-                Luna::Binary::Common.instance.deleteDirectory("#{rootName}#{podspecName}")
+                Common.instance.deleteDirectory("#{rootName}#{podspecName}")
               rescue => exception
                 
               ensure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luna-binary-uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - 车德超
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-21 00:00:00.000000000 Z
+date: 2021-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -133,6 +133,7 @@ files:
 - ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -142,6 +143,8 @@ files:
 - lib/luna/binary/build.rb
 - lib/luna/binary/common/common.rb
 - lib/luna/binary/delete.rb
+- lib/luna/binary/init.rb
+- lib/luna/binary/install.rb
 - lib/luna/binary/refresh.rb
 - lib/luna/binary/update.rb
 - lib/luna/binary/uploader.rb