luna-binary-uploader 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d54b08da3ecda037f4a5f1aa25e67c35acbafe5cce340f63dc5f6bd0cda7fba9
-  data.tar.gz: be02803fced8ac0fd75cb06f00df2a87be32e3e7ad707b4f32f1c6ee24995091
+  metadata.gz: 4ef5b62bf685747e70e13f3ea5480f37cb303dfe1b37cb66690baa8beee4ec3e
+  data.tar.gz: 9366ecb00ae20f321afce1b2ccc319793be0f4291c7e4ba4d900f0ad983f5f80
 SHA512:
-  metadata.gz: 80dc36ef3a07ce52fcdc8e3ced23694281d2decd69d7d32a352922595a54c3101997eca0de3c0d56de0a4306ffa6b97ae69a921da0be605c2893b47fb53e461d
-  data.tar.gz: 4c3360583f7a317f6fdda7b143ed57b78d584ff18e7815153579add4ba443b79c08cae8601af1bb5500c84c9204039c94023fe85ebdd25b6f7d85b87d769cad7
+  metadata.gz: 253788b801070db954121214fb1c9f1cbf4363350dfd2861716d8aeb68ff29f1fcffe1910b86b5ecd29f5b53d6966ab7b6db7481f837379a15d5d06f1b5af9ca
+  data.tar.gz: 2d6038f930cb1ded0bc343f7d747a913fd7a7d3d1e6c21b4b11808c118a5311bb7b41163f1c8f91fdd9a3be47f1afd6af13be78bbdd0ea43212bd175a2170039

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
@@ -188,6 +181,7 @@ class App
           obj.run
         else
          raise "缺少参数：1.xcworkspace 名称 eg:MyWorkSpace.xcworkspace 2.scheme eg: MyProject"
+        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

@@ -41,7 +41,7 @@ module Luna
             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/uploader/version.rb

@@ -1,7 +1,7 @@
 module Luna
   module Binary
     module Uploader
-      VERSION = "0.1.19"
+      VERSION = "0.1.20"
     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,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: luna-binary-uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - 车德超
@@ -139,6 +139,7 @@ files:
 - 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