luna-binary-uploader 0.1.16 → 0.1.20

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

@@ -14,7 +14,12 @@ module Luna
             attr_accessor :version, :state
             attr_accessor :podFilePath
             attr_accessor :lockfile
-            
+            attr_reader :bin_dev
+            attr_reader :binary_repo_url
+            attr_reader :binary_upload_url
+            attr_reader :binary_download_url
+            attr_reader :download_file_type
+          
             def initialize()
             end
 
@@ -22,7 +27,7 @@ module Luna
                 sources = Pod::Config.instance.sources_manager.all
                 repoPath = nil
                 sources.each { |item|
-                  if item.url == CBin.config.binary_repo_url
+                  if item.url == Common.instance.binary_repo_url
                     repoPath = item.repo
                   end
                 }
@@ -95,7 +100,7 @@ module Luna
             end
 
             def request_result_hash
-              command = "curl #{CBin.config.binary_upload_url}"
+              command = "curl #{Common.instance.binary_upload_url}"
               p command
               result = %x(#{command})
               request_result_hash = JSON.parse(result)
@@ -105,31 +110,151 @@ 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地址 : #{Common.instance.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
-              p "use_framework_list: #{list}"
-              return list
             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
+            end
+            return uploader
+          end
+
+          def dependenciesMapper
+            return lockfile.dependencies.map { |item| [item.name.split("/").first, item]}.to_h
+          end
+
+          def bin_dev
+            if @bin_dev == nil
+              @bin_dev = YAML.load_file("#{Pod::Config.instance.home_dir}/bin_dev.yml")
+            end
+            return @bin_dev
+          end
+
+          def binary_repo_url
+            if @binary_repo_url == nil
+                @binary_repo_url = bin_dev["binary_repo_url"]
+            end
+            return @binary_repo_url
+          end
+
+          def binary_upload_url
+            if @binary_upload_url == nil
+              cut_string = "/%s/%s/zip"
+              @binary_upload_url =  binary_download_url[0,binary_download_url.length - cut_string.length]
+            end
+            return @binary_upload_url
+          end
+
+          def binary_download_url
+            if @binary_download_url == nil
+              @binary_download_url = bin_dev["binary_download_url"]
+            end
+            return @binary_download_url
+          end
+
+          def download_file_type
+            if @download_file_type == nil
+              @download_file_type = bin_dev["download_file_type"]
+            end
+            return @download_file_type
+          end
+
         end    
     end
 end

data/lib/luna/binary/delete.rb

@@ -33,15 +33,15 @@ module Luna
             end
 
             def deleteRepo
-                command = "cd #{Luna::Binary::Common.instance.repoPath}; git stash;git checkout master;git pull origin master;"
+                command = "cd #{Common.instance.repoPath}; git stash;git checkout master;git pull origin master;"
                 system command
-                Luna::Binary::Common.instance.deleteDirectory("#{Luna::Binary::Common.instance.repoPath}/#{name}/#{version}")
-                commandADD = "cd #{Luna::Binary::Common.instance.repoPath};git add .; git commit -m 'DEL::#{name}-#{version} by LBU'; git push -f origin master"
+                Common.instance.deleteDirectory("#{Common.instance.repoPath}/#{name}/#{version}")
+                commandADD = "cd #{Common.instance.repoPath};git add .; git commit -m 'DEL::#{name}-#{version} by LBU'; git push -f origin master"
                 system commandADD
             end
 
             def deleteBinaryFramework 
-                command = "curl -X 'DELETE' #{CBin.config.binary_upload_url}/#{name}/#{version}"
+                command = "curl -X 'DELETE' #{Common.instance.binary_upload_url}/#{name}/#{version}"
                 p command 
                 system command
             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 #{Common.instance.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,55 +9,64 @@ 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 = Common.instance.createNeedFrameworkMapper
+                dependencies_mapper = 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 = Common.instance.upload_lockitem(dependencies_mapper,k ,binary_path, true)
+                            if uploader != nil
+                                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 
-                return Luna::Binary::Common.instance.lockfile
+                return Common.instance.lockfile
             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/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.20"
     end
   end
 end