luna-binary-uploader 0.1.17 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d663fbfaa88152aedca42571e25b0b406f606f8d891c2e425ea5b94f726113d
-  data.tar.gz: dc877ae8656c5fd30f93f1e3d273e5b3652b6ed4cd654da9030c314353e56aa2
+  metadata.gz: c35f885ef76e95875084e78aef96e601a6ab189bfbaf12a3d8564bcf1997c1b6
+  data.tar.gz: 84241a1e0ef378017077aedde663beeda591d8348670b4c6a95142e32b9383f7
 SHA512:
-  metadata.gz: 47d554b5f86b1562d277a923dc363fe5ed0e22191d5f65f9aa26034a7bdc9ab35f4a9ca4a1bb0a42555a7f71256620b8286fc8aa51b9e592fec10b0a6df6ae73
-  data.tar.gz: 7d6c49478e2a77cd2fadd69025335fbe1c9600d786efa4a23c23455537940d31db9e3c413b8c5138fb7b0ba8766b0ef07b60a0c779ea6cbd5bc57c6ac6e7eb4f
+  metadata.gz: dd2e1662d7698405f2ca17f9296b689f319e1ac9f9da8ebd91c3f472539a4bed7395364758e97047857de27dbcc5c267d5aba7ec8f5abc28db03b6f803f8a27d
+  data.tar.gz: 7f80e36a16f32319013ea7f61f643e8582d39faaa79ef6bd28e421c5e22d7dd3756d1729fcd23875c459c981fb2fb81a679af070c0e0734fb4440716b81a3a4d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    luna-binary-uploader (0.1.17)
+    luna-binary-uploader (0.1.21)
       cocoapods
       cocoapods-generate (~> 2.0.1)
       cocoapods-imy-bin (= 0.3.1.3)

data/bin/lbu

@@ -1,14 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "luna/binary/uploader"
-require "luna/binary/delete"
-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 "luna-binary-uploader"
 require 'gli'
 
 # You can add fixtures and/or initialization code here to make experimenting
@@ -21,7 +14,7 @@ require 'gli'
 class App
     extend GLI::App
   
-    program_desc 'luna cocopods-imy-bin自定义二进制上传'
+    program_desc 'luna-binary-uploader 自定义二进制上传'
   
     version Luna::Binary::Uploader::VERSION
   
@@ -73,9 +66,10 @@ class App
     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, 表示不用二进制"
+        elsif args[0] && args[0] == "n"
+          is_open = "false"
         else
           is_open = "true"
         end
@@ -84,7 +78,7 @@ class App
     end
 
     desc '单个上传二进制文件'
-    arg_name '1.模块名 git地址 git节点 xcode编译的缓存地址 \n 2.模块名 版本号 xcode编译的缓存地址 \n 3.模块名 本地podspec地址 xcode编译的缓存地址'
+    arg_name 'a.模块名 git地址 git节点 xcode编译的缓存地址 \n b.模块名 版本号 xcode编译的缓存地址 \n c.模块名 本地podspec地址 xcode编译的缓存地址'
     command :single do |c|
       c.action do |global_options,options,args|
         if args[3] #模式1
@@ -123,10 +117,14 @@ class App
     end
 
     desc '单个删除repo 里的podspec & 服务二进制文件'
-    arg_name '模块名 版本号'
+    arg_name '1.模块名 2.版本号'
     command :del do |c|
       c.action do |global_options,options,args|
-        Luna::Binary::Delete.new(args[0],args[1]).delete
+        if args[0] && args[1]
+          Luna::Binary::Delete.new(args[0],args[1]).delete
+        else
+          raise "缺少参数：1.模块名 2.版本号"
+        end
       end
     end
 
@@ -177,10 +175,14 @@ class App
     arg_name '1.xcworkspace 名称 eg:MyWorkSpace.xcworkspace 2.scheme eg: MyProject'
     command :build do |c|
       c.action do |global_options,options,args|
+        if args[0] && args[1]
           obj = Luna::Binary::Build.new()
           obj.workspace=args[0]
           obj.scheme=args[1]
           obj.run
+        else
+         raise "缺少参数：1.xcworkspace 名称 eg:MyWorkSpace.xcworkspace 2.scheme eg: MyProject"
+        end
       end
     end
 
@@ -188,8 +190,28 @@ class App
     arg_name '1.armPath 2.x86path'
     command :merge do |c|
       c.action do |global_options,options,args|
+        if args[0] &&  args[1]
           obj = Luna::Binary::Build.new()
           obj.mergeFrameWorks(args[0], args[1])
+        else
+          raise "缺少参数：1.armPath 2.x86path"
+        end
+      end
+    end
+
+    desc 'benchmark 二进制和非二进制'
+    arg_name '1.跑工程几次 2.workspace 3.scheme 4.normal正常模式下 binary二进制模式下，不传的话都跑'
+    command :benchmark do |c|
+      c.action do |global_options,options,args|
+        obj = Luna::Binary::BenchMark.new(Integer(args[0]), args[1], args[2])
+        if args[3] == "normal"
+          obj.run_no_binary
+        elsif args[3] == "binary"
+          obj.run_binary
+        else
+          obj.run
+        end
+        obj.print
       end
     end
 

data/lib/luna/binary/analysis.rb

@@ -20,21 +20,21 @@ module Luna
         end
 
         def validate!
-            arr = Dir.glob(Luna::Binary::Common.instance.podFilePath)
+            arr = Dir.glob(Common.instance.podFilePath)
             if arr == nil 
                 raise '当前路径下没有Podfile'
             end
         end
 
         def lockfile
-            return Luna::Binary::Common.instance.lockfile
+            return Common.instance.lockfile
         end
 
         def run
             failList = []
             successList = []
     
-            dependenciesMapper = Luna::Binary::Common.instance.dependenciesMapper
+            dependenciesMapper = Common.instance.dependenciesMapper
             dedupingMapper = {}
             lockfile.pod_names.each { |item|
                     moduleName = item.split('/').first
@@ -42,7 +42,7 @@ module Luna
                         dedupingMapper[moduleName] = moduleName
                         puts moduleName.yellow
                         begin
-                            uploader = Luna::Binary::Common.instance.upload_lockitem(dependenciesMapper, moduleName, binary_path)
+                            uploader = Common.instance.upload_lockitem(dependenciesMapper, moduleName, binary_path)
                             if uploader != nil
                                 successList << uploader
                             else
@@ -133,7 +133,7 @@ module Luna
         end
 
         def command(c)
-            return Luna::Binary::Common.instance.command(c)
+            return Common.instance.command(c)
         end
 
     end

data/lib/luna/binary/benchmark.rb

@@ -0,0 +1,115 @@
+require 'date'
+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 DogTimer
+
+            attr_accessor :start_time
+            attr_accessor :end_time
+            attr_accessor :delta_time
+            def initialize()
+                
+            end
+
+            def start
+                @start_time = Time.now()
+                puts start_time
+            end
+
+            def end
+                @end_time = Time.now()
+                puts end_time
+            end
+
+            def delta
+                @delta_time = @end_time - @start_time
+            end
+
+            def print
+                puts "start time: #{start_time.inspect} end time: #{end_time.inspect} delta time: #{delta}s ".yellow
+            end
+        end
+
+        class BenchMark
+            attr_reader :times
+            attr_reader :workspace
+            attr_reader :scheme
+            attr_reader :binary_time_arr
+            attr_reader :normal_time_arr
+            
+            def initialize(times, workspace, scheme)
+                @times = times
+                @workspace = workspace
+                @scheme = scheme
+                @binary_time_arr = []
+                @normal_time_arr = []
+            end
+
+            def run
+                run_binary
+                run_no_binary
+            end
+
+            def run_binary
+                i = 0
+                Common.instance.command("lbu install")
+                while i < times
+                    t = DogTimer.new()
+                    t.start
+                    Common.instance.command("xcodebuild -workspace #{workspace} -scheme #{scheme} -configuration Debug")
+                    t.end
+                    binary_time_arr << t
+                    i = i + 1
+                end
+            end
+
+            def run_no_binary
+                Common.instance.command("lbu install n")
+                i = 0
+                while i < times
+                    t = DogTimer.new()
+                    t.start
+                    Common.instance.command("xcodebuild -workspace #{workspace} -scheme #{scheme} -configuration Debug")
+                    t.end
+                    normal_time_arr << t
+                    i = i + 1
+                end
+            end
+
+
+            def print
+                i = 0
+                sum_time = 0
+                normal_time_arr.each { |item|
+                    item.print
+                    sum_time += item.delta
+                    p sum_time
+                    i += 1
+                }
+
+                puts "normal average time: #{sum_time/i}"
+                i = 0
+                sum_time = 0
+                binary_time_arr.each { |item|
+                    item.print
+                    sum_time += item.delta
+                    p sum_time
+                    i += 1
+                }
+                puts "binary average time: #{sum_time/i}"
+            end
+        end
+
+        
+    end
+end
+        

data/lib/luna/binary/build.rb

@@ -20,27 +20,25 @@ module Luna
             end
 
             def command(c)
-                return Luna::Binary::Common.instance.command(c)
+                return Common.instance.command(c)
             end
 
             def createFrameworks
                 isNext = true
                 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
+                Install.new(false)
+                Common.instance.deleteDirectory(binary_path_arm)
+                tempLunaUploaderPath = 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/Debug-iphoneos #{binary_path_arm}") if isNext == true #本可以用CONFIGURATION_BUILD_DIR直接指定结果文件夹，结果经常性的编译报错
-                Luna::Binary::Common.instance.deleteDirectory(binary_path_x86)
+                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/Debug-iphonesimulator #{binary_path_x86}") if isNext == true
                 mergeFrameWorks(binary_path_arm, binary_path_x86) if isNext == true
             end
     
             def mergeFrameWorks(binary_path_arm, binary_path_x86)
-                Luna::Binary::Common.instance.deleteDirectory(binary_path_merged)
+                Common.instance.deleteDirectory(binary_path_merged)
                 dedupingMapper = {}
                 failList = []
                 p lockfile.pod_names
@@ -74,7 +72,7 @@ module Luna
             end
 
             def lockfile
-                return Luna::Binary::Common.instance.lockfile
+                return Common.instance.lockfile
             end
     
             def xcodeSimulators
@@ -99,15 +97,15 @@ module Luna
     
     
             def binary_path_merged
-                return Luna::Binary::Common.instance.binary_path_merged
+                return Common.instance.binary_path_merged
             end
     
             def binary_path_arm
-                return Luna::Binary::Common.instance.binary_path_arm
+                return Common.instance.binary_path_arm
             end
     
             def binary_path_x86
-                return Luna::Binary::Common.instance.binary_path_x86
+                return Common.instance.binary_path_x86
             end
         end
     end

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,7 +110,7 @@ module Luna
           
           def createNeedFrameworkMapper
               spec_repo_binary = {}
-              puts "二进制repo地址 : #{CBin.config.binary_repo_url}".yellow
+              puts "二进制repo地址 : #{Common.instance.binary_repo_url}".yellow
               use_framework_list.each { |item|
                   name = item.split('/').first
                   if spec_repo_binary[name] == nil
@@ -214,6 +219,42 @@ module Luna
             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

@@ -17,7 +17,7 @@ module Luna
 
             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}")
+                 Common.instance.command("pod repo add z-ios-framework-spec-repo #{Common.instance.binary_repo_url}")
             end
 
         end

data/lib/luna/binary/refresh.rb

@@ -9,8 +9,8 @@ module Luna
             attr_accessor :request_result_hash
 
             def run 
-                spec_repo_binary = Luna::Binary::Common.instance.createNeedFrameworkMapper
-                dependencies_mapper = Luna::Binary::Common.instance.dependenciesMapper
+                spec_repo_binary = Common.instance.createNeedFrameworkMapper
+                dependencies_mapper = Common.instance.dependenciesMapper
                 failList = []
                 successList = []
                 spec_repo_binary.each { |k,v|
@@ -18,9 +18,9 @@ module Luna
                         begin
                             puts "#{k} #{v}".yellow
                             
-                            uploader = Luna::Binary::Common.instance.upload_lockitem(dependencies_mapper,k ,binary_path, true)
+                            uploader = Common.instance.upload_lockitem(dependencies_mapper,k ,binary_path, true)
                             if uploader != nil
-                                Luna::Binary::Delete.new(k,v).delete
+                                Delete.new(k,v).delete
                                 puts "#{k} #{v} 重新制作上传".yellow
                                 uploader.upload
                                 successList << "#{k} #{v}"
@@ -57,12 +57,12 @@ module Luna
             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

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

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

data/lib/luna/binary/uploader.rb

@@ -322,7 +322,7 @@ module Luna
         end
 
         def binary_source
-          { http: format(CBin.config.binary_download_url, specification.root.name, specification.version), type: CBin.config.download_file_type }
+          { http: format(Common.instance.binary_download_url, specification.root.name, specification.version), type: Common.instance.download_file_type }
         end
 
         def source_files(suffix)
@@ -385,7 +385,7 @@ module Luna
         end
 
         def isHasFrameworkInService
-          command = "curl #{format(CBin.config.binary_download_url, specification.root.name, specification.version).sub("#{CBin.config.download_file_type}","")}"
+          command = "curl #{format(Common.instance.binary_download_url, specification.root.name, specification.version).sub("#{Common.instance.download_file_type}","")}"
           p command
           result = %x(#{command})
           resultHash = JSON.parse(result)
@@ -405,7 +405,7 @@ module Luna
           zipCommand = "cd #{rootName};zip -r #{specification.root.name}.zip #{specification.root.name}"
           p zipCommand
           system zipCommand
-          command = "cd #{rootName};curl #{CBin.config.binary_upload_url} -F \"name=#{specification.root.name}\" -F \"version=#{specification.version}\" -F \"annotate=#{specification.root.name}_#{specification.version}_log\" -F \"file=@#{specification.root.name}.zip\""
+          command = "cd #{rootName};curl #{Common.instance.binary_upload_url} -F \"name=#{specification.root.name}\" -F \"version=#{specification.version}\" -F \"annotate=#{specification.root.name}_#{specification.version}_log\" -F \"file=@#{specification.root.name}.zip\""
           p command 
           system command
         end

data/lib/luna-binary-uploader.rb

@@ -0,0 +1,10 @@
+require "luna/binary/uploader"
+require "luna/binary/delete"
+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 "luna/binary/common/common"
+require "luna/binary/benchmark"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luna-binary-uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.21
 platform: ruby
 authors:
 - 车德超
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -139,7 +139,9 @@ files:
 - Rakefile
 - bin/lbu
 - bin/setup
+- lib/luna-binary-uploader.rb
 - lib/luna/binary/analysis.rb
+- lib/luna/binary/benchmark.rb
 - lib/luna/binary/build.rb
 - lib/luna/binary/common/common.rb
 - lib/luna/binary/delete.rb