luna-binary-uploader 0.1.16 → 0.1.20

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}"
@@ -291,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)
@@ -333,7 +364,7 @@ module Luna
 
         
         def repoPath
-          return Luna::Binary::Common.instance.repoPath
+          return Common.instance.repoPath
         end
 
         def isHasSpecInRepo
@@ -354,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)
@@ -374,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
@@ -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

data/lib/luna-binary-uploader.rb

@@ -0,0 +1,9 @@
+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"

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.20
 platform: ruby
 authors:
 - 车德超
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-21 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -133,15 +133,19 @@ files:
 - ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/lbu
 - bin/setup
+- lib/luna-binary-uploader.rb
 - lib/luna/binary/analysis.rb
 - 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