cocoapods-tdfire-binary 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea1d376b0a06e9e6e6ed83ebb20eb4ef788eadec
-  data.tar.gz: 38db755f1e60f2c6a06318b4392abccfbf4f54d1
+  metadata.gz: fece042809d277fc9ced8983f9ddfe21be344ae8
+  data.tar.gz: b868c43363b5f13885739fe8e9d31b954ddb231b
 SHA512:
-  metadata.gz: 4b17d33a39e4baa73717c7644aff7e94732a067f5ff3b39b4c38aed31ff349a4002a08ccf75f44b0f76657445073d4cd477097ac27358cc0182b4934cde8bc13
-  data.tar.gz: 6b3805bfd0b6a35b5ec09cc56aa49fd78955da75758bde29f678bbfad518ec168dfcc75a09fa9e884cfabb972165873538326402cff08195dcf51c44b2a1637b
+  metadata.gz: 9895fab2d02a195aaee0ed6caf29db32ca386e8e856f9ce0411ac60f97444f2644d96be0fb00c9f31ece79d7cc8198aab7c56a630253fc683374262f37cb0535
+  data.tar.gz: 822a298b41f9a8b64201c2e77522cc7addb82a995c830da641b3b2d1c114c369874be9646c69f62d586141229ff1be2f1254f533837087df6275df6b158bc26f

data/README.md

@@ -30,22 +30,103 @@
 
 ## 使用
 
+> 二进制组件发布
 
+此插件需要结合[二进制服务器](https://github.com/tripleCC/binary-server)使用，运行服务器之后，就可以测试二进制打包了。
 
-此插件需要结合二进制服务器使用，其中主要接口如下：
+运行 `pod binary init` 配置二进制插件基本信息，其中包括二进制服务器地址，私有源 Git 地址，pod 模版地址：
 
+```shell
+开始设置二进制化初始信息.
+所有的信息都会保存在 binary_config.yaml 文件中.
+你可以在 /Users/songruiwang/.cocoapods/binary_config.yml 目录下手动添加编辑该文件.
+/Users/songruiwang/.cocoapods/binary_config.yml 文件包含配置信息如下：
 
+---
+server_host: 输入二进制服务器地址 (比如 http://xxxxx:8080)
+repo_url: 输入私有源 Git 地址 (比如 https://github.com/tripleCC/PrivateSpecRepo.git)
+template_url: 输入 pod 模版 Git 地址 (比如 https://github.com/CocoaPods/pod-template.git)
 
+
+输入二进制服务器地址 (比如 http://xxxxx:8080)
+旧值：http://localhost:8080
+ >
+http://localhost:8080
+
+输入私有源 Git 地址 (比如 https://github.com/tripleCC/PrivateSpecRepo.git)
+旧值：git@git.2dfire-inc.com:ios/cocoapods-spec.git
+ >
+git@git.2dfire-inc.com:ios/cocoapods-spec.git
+
+输入 pod 模版 Git 地址 (比如 https://github.com/CocoaPods/pod-template.git)
+旧值：git@git.2dfire-inc.com:ios/binary-pod-template.git
+ >
+git@git.2dfire-inc.com:ios/binary-pod-template.git
+
+设置完成.
 ```
 
+设置完成之后，运行 `pod binary lib create` 创建组件库。
+
+组件库创建完成后，修改 `podspec` 文件：
+
+```ruby
+Pod::Spec.new do |s|
+  s.name = 'XXXX'
+  ....
+
+  tdfire_source_configurator = lambda do |s|
+    # 把一些源码配置移到 lambda 中
+    # source configuration
+    # s.source_files = 'PodA/Classes/**/*'
+    # s.resource_bundles = {
+    #   'PodA' => ['PodA/Assets/*']
+    # }
+  end
+
+  # 此段原样拷贝即可
+  unless %w[tdfire_set_binary_download_configurations tdfire_source tdfire_binary].reduce(true) { |r, m| s.respond_to?(m) & r }
+    
+    tdfire_source_configurator.call s
+  else
+    s.tdfire_source tdfire_source_configurator
+    s.tdfire_binary tdfire_source_configurator
+    s.tdfire_set_binary_download_configurations
+  end
+end
 ```
 
+修改完成后，提交代码，打个 Tag ，推送至远程仓库。
+
+接下来处理二进制版本事宜。
+
+首先执行 `pod binary package` 创建二进制版本（静态 framework），可以看到本地文件中会新增 `xxx.framework.zip` 压缩文件。
+
+接下来执行 `pod binary push` 推送二进制至服务器，执行 `pod binary list` 可以查看推送上去的组件信息。
+
+源码和二进制版本都安排妥当，就可以执行 `pod binary publish` 发布组件了。
+
+> 使用二进制组件
 
+执行 `pod binary lib create` 创建测试工程，修改 `Podfile` ：
 
+```ruby
+# 引入插件
+plugin 'cocoapods-tdfire-binary'
 
+# 使用二进制依赖
+tdfire_use_binary!
 
+# 使用源码依赖的组件
+tdfire_use_source_pods ['AFNetworking']
 ```
 
+运行 `pod update --verbose`，可以看到插件输出额外的 `Tdfire: xxx` 信息。
+
+集成完成后，点击工程 `Pods` 下对应组件目录，就可以看到此次集成采用的二进制依赖了。
+
+<!-- ```
+
 
 Usage:
 
@@ -179,4 +260,4 @@ end
 ```
 env tdfire_use_binary=1 tdfire_unpublished_pods=PodA pod lib lint xxxx
 env tdfire_force_use_source=1 pod install
-```
+``` -->

data/lib/cocoapods-tdfire-binary/binary_config.rb

@@ -50,9 +50,15 @@ module Pod
       end
 
       def private_sources(keywords = repo_url)
-        config.sources_manager.all.select do |source|
+        sources = config.sources_manager.all.select do |source|
           source.url.downcase.include? keywords
         end
+
+        if sources.empty?
+          raise Pod::Informative, "获取不到与 #{repo_url} 相关的私有源信息，执行 pod binary init 或手动在 #{binary_setting_file} 重新设置." 
+        end
+
+        sources
       end
 
       private

data/lib/cocoapods-tdfire-binary/binary_url_manager.rb

@@ -4,7 +4,7 @@ module Pod
     module Tdfire
         class BinaryUrlManager
       def self.pull_url_for_pod_version(pod, version)
-                host + "/download/#{pod}/#{version}"
+                host + "/frameworks/#{pod}/#{version}/zip"
             end
 
             def self.get_pull_url_for_pod_version(pod, version)
@@ -13,36 +13,32 @@ module Pod
                 run_curl command
             end
 
-            def self.push_url
-        host + "/upload" #+ param
-            end
-
             def self.post_push_url(name, version, path, commit = nil, commit_hash = nil)
-                param = %Q[-F "frameworkName=#{name}" -F "version=#{version}" -F "changelog=#{commit}" -F "featureName=#{commit}" -F "framework=@#{path}" -F "commitHash=#{commit_hash}"]
-                command = "curl #{push_url} #{param}"
+                param = %Q[-F "name=#{name}" -F "version=#{version}" -F "annotate=#{commit}" -F "file=@#{path}" -F "sha=#{commit_hash}"]
+                command = "curl #{host}/frameworks #{param}"
 
                 run_curl command
             end
 
             def self.delete_binary(name, version)
-                command = "curl -X 'DELETE' #{host}/framework/#{name}/#{version} -O -J"
+                command = "curl -X 'DELETE' #{host}/frameworks/#{name}/#{version} -O -J"
                 run_curl command
             end
 
             def self.list_binary()
-                command = "curl #{host}/frameworks\?allinfo=true"
+                command = "curl #{host}/frameworks"
                 run_curl command
             end
 
             def self.search_binary(name)
-                command = "curl #{host}/framework/#{name}"
+                command = "curl #{host}/frameworks/#{name}"
                 run_curl command
             end
 
             def self.run_curl(command)
                 Pod::UI.message "CURL: \n" + command + "\n"
 
-                result = `#{command} -s -m 5`
+                result = `#{command} -f -s -m 5`
 
                 raise Pod::Informative, "执行 #{command} 失败，查看网络或者 binary_config.yml 配置." if $?.exitstatus != 0
 

data/lib/cocoapods-tdfire-binary/command/init.rb

@@ -21,9 +21,9 @@ module Pod
           @asker.wellcome_message
 
           hash = binary_config.setting_hash
-
           Pod::Tdfire::InitAsker::QUESTIONS.each do |k, v|
-            hash[k] = @asker.ask_with_answer(v, hash[k])
+            default = hash[k] unless hash.nil?
+            hash[k] = @asker.ask_with_answer(v, default)
           end
 
           binary_config.config_with_setting(hash)

data/lib/cocoapods-tdfire-binary/command/push.rb

@@ -41,11 +41,13 @@ module Pod
 						name = spec.name 
 	      	end
 
-		      path += ZIP_SUBFFIX unless path.end_with?(ZIP_SUBFFIX)
+	      	if path 
+			      path += ZIP_SUBFFIX unless path.end_with?(ZIP_SUBFFIX)
+			    end
 
 
 	      	@path = path
-	      	@name = name || path.split('/').last.sub(ZIP_SUBFFIX, '')
+	      	@name = name || path.split('/').last.sub(ZIP_SUBFFIX, '') if path
 	      	@version = version
 	      	@commit = commit
 	      	super

data/lib/cocoapods-tdfire-binary/command/search.rb

@@ -30,10 +30,11 @@ module Pod
         def run
           result = Pod::Tdfire::BinaryUrlManager.search_binary(@name)
           pod = JSON.parse(result) unless result.nil?
-          pod ||= {'' => []}
+          pod ||= {@name => []}
 
-          name = pod['name'] || @name
-          versions = pod['versions'] || []
+          
+          name = pod.keys.first
+          versions = pod.values.first || []
 
           title = "-> #{name} (#{versions.last})".green
 

data/lib/cocoapods-tdfire-binary/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsTdfireBinary
-  VERSION = "1.3.7"
+  VERSION = "1.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdfire-binary
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - tripleCC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-28 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler