cocoapods-tdfire-binary 1.0.10 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f18d003702464d5348466610a3bf47a5b8b7f051
-  data.tar.gz: aa789bc5aa73e6b9daf31b4bd2f2a3fd1ac0141b
+  metadata.gz: 2c3223e645db7605a686c87ec21cd8e9f65137f7
+  data.tar.gz: 2d77cd8c5f649508103672cf68e620121a358ca7
 SHA512:
-  metadata.gz: 58d963064f599b58aebdf327526b9b7d2ce21fd9b1ef4fd1fe4e6c3b6016b5d1aceaf93bfa7a928f4bf7805e5b59900fc1a6597567cfb4f54c0f7537d8b0101b
-  data.tar.gz: 63b57e9f55de5e684b669b573722cb4d8650728a838fa1bfccccfda3e8fc1ca530983b7bcbe8e9c6a8a9dd61ae518d37581ba3f4b83d9f30095fe9d5a3ac5b2d
+  metadata.gz: dec1824477e3e4733e3d4a427512a6e3a7131f02bd5ae244753ca9ef0a0732be3287d7b1580ea1f921e6015e8d1a59408efb418f73a5ad1779116b6db7769169
+  data.tar.gz: 5ec985ed6396951b4bf3e7b9938e183cdb38fdc5d6128ac261a38b1a31b4888d87e1088cb57214cf95b29523400fe7865e7a8c9f01c13839fb465b6dbc3178a6

data/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_BIN: "bin"

data/.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 pkg
 .idea/
+bin/

data/.travis.yml

@@ -0,0 +1,8 @@
+osx_image: xcode7.3
+language: ruby
+cache: bundler
+before_install:
+- bundle install
+- bundle exec pod repo update --silent
+script:
+- bundle exec rake spec

data/.vscode/launch.json

@@ -0,0 +1,64 @@
+{
+    // 使用 IntelliSense 了解相关属性。 
+    // 悬停以查看现有属性的描述。
+    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug Local File",
+            "type": "Ruby",
+            "request": "launch",
+            "cwd": "${workspaceRoot}",
+            "program": "${workspaceRoot}/main.rb"
+        },
+        {
+            "name": "Listen for rdebug-ide",
+            "type": "Ruby",
+            "request": "attach",
+            "cwd": "${workspaceRoot}",
+            "remoteHost": "127.0.0.1",
+            "remotePort": "1234",
+            "remoteWorkspaceRoot": "${workspaceRoot}"
+        },
+        {
+            "name": "Rails server",
+            "type": "Ruby",
+            "request": "launch",
+            "cwd": "${workspaceRoot}",
+            "program": "${workspaceRoot}/bin/rails",
+            "args": [
+                "server"
+            ]
+        },
+        {
+            "name": "RSpec - all",
+            "type": "Ruby",
+            "request": "launch",
+            "cwd": "${workspaceRoot}",
+            "program": "${workspaceRoot}/bin/rspec",
+            "args": [
+                "-I",
+                "${workspaceRoot}"
+            ]
+        },
+        {
+            "name": "RSpec - active spec file only",
+            "type": "Ruby",
+            "request": "launch",
+            "cwd": "${workspaceRoot}",
+            "program": "${workspaceRoot}/bin/rspec",
+            "args": [
+                "-I",
+                "${workspaceRoot}",
+                "${file}"
+            ]
+        },
+        {
+            "name": "Cucumber",
+            "type": "Ruby",
+            "request": "launch",
+            "cwd": "${workspaceRoot}",
+            "program": "${workspaceRoot}/bin/cucumber"
+        }
+    ]
+}

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-tdfire-binary (1.0.10)
+    cocoapods-tdfire-binary (1.1.0)
       cocoapods (~> 1.2)
       cocoapods-packager (~> 1.5.0)
 
@@ -17,27 +17,27 @@ GEM
     atomos (0.1.2)
     bacon (1.2.0)
     claide (1.0.2)
-    cocoapods (1.2.1)
+    cocoapods (1.5.0)
       activesupport (>= 4.0.2, < 5)
-      claide (>= 1.0.1, < 2.0)
-      cocoapods-core (= 1.2.1)
-      cocoapods-deintegrate (>= 1.0.1, < 2.0)
-      cocoapods-downloader (>= 1.1.3, < 2.0)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.5.0)
+      cocoapods-deintegrate (>= 1.0.2, < 2.0)
+      cocoapods-downloader (>= 1.2.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.2.0, < 2.0)
+      cocoapods-trunk (>= 1.3.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.7)
+      molinillo (~> 0.6.5)
       nap (~> 1.0)
       ruby-macho (~> 1.1)
-      xcodeproj (>= 1.4.4, < 2.0)
-    cocoapods-core (1.2.1)
-      activesupport (>= 4.0.2, < 5)
+      xcodeproj (>= 1.5.7, < 2.0)
+    cocoapods-core (1.5.0)
+      activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.2)
@@ -66,7 +66,7 @@ GEM
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.3)
       mocha (>= 0.13.0)
-    molinillo (0.5.7)
+    molinillo (0.6.5)
     nanaimo (0.2.5)
     nap (1.1.0)
     netrc (0.11.0)

data/README.md

@@ -1,4 +1,4 @@
-x# cocoapods-tdfire-binary
+# cocoapods-tdfire-binary
 
 A description of cocoapods-tdfire-binary.
 

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

@@ -0,0 +1,92 @@
+require 'yaml'
+require 'fileutils'
+
+module Pod
+  module Tdfire
+    class BinaryConfig
+      public
+
+      REPO_URL_KEY = 'repo_url'.freeze
+      SERVER_ROOT_KEY = 'server_host'.freeze
+      TEMPLATE_URL_KEY = 'template_url'.freeze
+
+      def self.instance
+        @instance ||= new
+      end
+
+      def repo_url
+        setting_for_key(REPO_URL_KEY)
+      end
+
+      def server_host
+        setting_for_key(SERVER_ROOT_KEY)
+      end
+
+      def template_url
+        setting_for_key(TEMPLATE_URL_KEY)
+      end
+
+      def setting_hash
+        @setting ||= begin
+          if File.exist?(binary_setting_file)
+            @setting = YAML.load_file(binary_setting_file)
+          end
+        end
+        @setting
+      end
+
+      def setting_file_name
+        'binary_config.yml'
+      end
+
+      def binary_setting_file
+        config.home_dir + setting_file_name
+      end
+
+      def config_with_setting(setting)
+        File.open(binary_setting_file, 'w+') do |f|
+          f.write(setting.to_yaml)
+        end
+      end
+
+      def private_sources(keywords = repo_url)
+        config.sources_manager.all.select do |source|
+          source.url.downcase.include? keywords
+        end
+      end
+
+      private
+
+      def config
+        Config.instance
+      end
+
+      def setting_for_key(key)
+        validate_setting_file
+
+        setting = setting_hash[key]
+        if setting.nil?
+          raise Pod::Informative, "获取不到 #{key} 的配置信息，执行 pod binary init 或手动在 #{binary_setting_file} 设置."
+        end
+        setting
+      end
+
+      def validate_setting_file
+        return if binary_setting_file.exist?
+
+        # 公司内部就不用自己配置了
+        sources = private_sources('2dfire')
+        if sources.empty?
+          raise Pod::Informative, '获取不到配置信息，执行 pod binary init 初始化配置信息.'
+        end
+
+        FileUtils.cd(config.home_dir) do
+          `git clone http://git.2dfire-inc.com/qingmu/cocoapods-tdfire-binary-config`
+
+          FileUtils.mv("cocoapods-tdfire-binary-config/#{setting_file_name}", '.')
+          FileUtils.rm_rf(config.home_dir + 'cocoapods-tdfire-binary-config')
+        end
+      end
+    end
+  end
+end

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

@@ -103,9 +103,23 @@ module Pod
         # 所以这里需要暴露 static framework 中的 bundle ，明确让 CocoaPods 拷贝 bundle 到 main bundle，
         # 可以查看 高德地图 和 友盟等 framework ，都已这种方式处理
         #
-        target_spec.resources = ["#{target_spec.root.name}.framework/Resources/*.bundle", "#{target_spec.root.name}.framework/Versions/A/Resources/*.bundle"]
-				# target_spec.source_files = ["#{target_spec.root.name}.framework/Headers/*", "#{target_spec.root.name}.framework/Versions/A/Headers/*"]
-				# target_spec.public_header_files = ["#{target_spec.root.name}.framework/Headers/*", "#{target_spec.root.name}.framework/Versions/A/Headers/*"]
+        # 如果组件不是用的 resource_bundle，而是用的 resources ，那么这里就不会拷贝组件的资源文件
+        #
+
+        framework_resources = spec.tdfire_recursive_value('resources', :ios)
+        resource_bundles = spec.tdfire_recursive_value('resource_bundles', :ios)
+        # 不判断 lint 会报错 did not match any file
+        target_spec.resources = ["#{target_spec.root.name}.framework/Resources/*", "#{target_spec.root.name}.framework/Versions/A/Resources/*"] if resource_bundles.select(&:any?).any? || framework_resources.any?
+        Pod::UI.message "Tdfire: resources for binary: #{target_spec.tdfire_recursive_value('resources', :ios).join(', ')}"
+
+        # cococapods 会将以下头文件添加入 user search path ，这样使用者可以使用 " " 对头文件进行引用
+        #
+        #
+        # 不能通过下面这种方式判断
+        # Dir.glob("#{target_spec.root.name}.framework/Headers/*").count
+
+        target_spec.source_files = ["#{target_spec.root.name}.framework/Headers/*", "#{target_spec.root.name}.framework/Versions/A/Headers/*"]
+        target_spec.public_header_files = ["#{target_spec.root.name}.framework/Headers/*", "#{target_spec.root.name}.framework/Versions/A/Headers/*"]
 
         available_platforms(spec).each do |platform|
           Pod::UI.section("Tdfire: copying configuration for platform #{platform}") do
@@ -139,28 +153,27 @@ module Pod
 			# spec 是源码依赖时的配置
 			def set_preserve_paths(spec)
         available_platforms(spec).each do |platform|
-          Pod::UI.section("Tdfire: set preserve paths for platform #{platform}") do
-            # 源码、资源文件
-            #
-            source_files = spec.tdfire_recursive_value('source_files', platform)
-            resources = spec.tdfire_recursive_value('resources', platform)
-            resource_bundles = spec.tdfire_recursive_value('resource_bundles', platform)
+          Pod::UI.message("Tdfire: set preserve paths for platform #{platform}")
+          # 源码、资源文件
+          #
+          source_files = spec.tdfire_recursive_value('source_files', platform)
+          resources = spec.tdfire_recursive_value('resources', platform)
+          resource_bundles = spec.tdfire_recursive_value('resource_bundles', platform)
 
-            source_preserve_paths = source_files + resources + resource_bundles.map(&:values).flatten
+          source_preserve_paths = source_files + resources + resource_bundles.map(&:values).flatten
 
-            # 二进制文件
-            framework_preserve_paths = [framework_name]
-            preserve_paths = source_preserve_paths + framework_preserve_paths
+          # 二进制文件
+          framework_preserve_paths = [framework_name]
+          preserve_paths = source_preserve_paths + framework_preserve_paths
 
-            # 保留原有的 preserve_paths
-            target_preserve_paths = target_spec.tdfire_recursive_value('preserve_paths', platform)
-            preserve_paths += target_preserve_paths unless target_preserve_paths.empty?
+          # 保留原有的 preserve_paths
+          target_preserve_paths = target_spec.tdfire_recursive_value('preserve_paths', platform)
+          preserve_paths += target_preserve_paths unless target_preserve_paths.empty?
 
-            target_platform = target_spec.send(platform.to_sym)
-            target_platform.preserve_paths = preserve_paths.uniq
+          target_platform = target_spec.send(platform.to_sym)
+          target_platform.preserve_paths = preserve_paths.uniq
 
-            Pod::UI.message "Tdfire: preserve paths for #{platform}: #{preserve_paths.join(', ')}"
-          end
+          Pod::UI.message "Tdfire: preserve paths for #{platform}: #{preserve_paths.join(', ')}"
         end
 			end
 

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

@@ -1,10 +1,10 @@
+require 'cocoapods-tdfire-binary/binary_config'
+
 module Pod
 	module Tdfire
 		class BinaryUrlManager
-			HOST = "http://iosframeworkserver-shopkeeperclient.cloudapps.2dfire.com"
-
-			def self.pull_url_for_pod_version(pod, version)
-				HOST + "/getframework/PRODUCTION/#{pod}/#{version}"
+      def self.pull_url_for_pod_version(pod, version)
+				host + "/download/#{pod}/#{version}"
 			end
 
 			def self.get_pull_url_for_pod_version(pod, version)
@@ -14,29 +14,51 @@ module Pod
 			end
 
 			def self.push_url
-				HOST + "/upload" #+ param
+        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 "environment=PRODUCTION" -F "changelog=#{commit}" -F "featureName=#{commit}" -F "framework=@#{path}" -F "commitHash=#{commit_hash}"]
+				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}"
 
 				run_curl command
 			end
 
+			def self.delete_binary(name, version)
+				command = "curl -X 'DELETE' #{host}/framework/#{name}/#{version} -O -J"
+				run_curl command
+			end
+
+			def self.list_binary()
+				command = "curl #{host}/frameworks\?allinfo=true"
+				run_curl command
+			end
+
+			def self.search_binary(name)
+				command = "curl #{host}/framework/#{name}"
+				run_curl command
+			end
+
 			def self.run_curl(command)
 				Pod::UI.message "CURL: \n" + command + "\n"
 
-				system command
+				result = `#{command} -s -m 5`
+
+				raise Pod::Informative, "执行 #{command} 失败，查看网络或者 binary_config.yml 配置." if $?.exitstatus != 0
+
+				result
 			end
 
+      def self.host
+        BinaryConfig.instance.server_host
+      end
+
 			def self.private_cocoapods_url
-				"git@git.2dfire-inc.com:ios/cocoapods-spec.git"
-				# "git@git.2dfire-inc.com:qingmu/private_cocoapods.git"
+        BinaryConfig.instance.repo_url
 			end
 
 			def self.template_lib_url
-				"git@git.2dfire-inc.com:ios/binary-pod-template.git"
+        BinaryConfig.instance.template_url
 			end
 		end
 	end

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

@@ -5,6 +5,11 @@ require 'cocoapods-tdfire-binary/command/pull'
 require 'cocoapods-tdfire-binary/command/push'
 require 'cocoapods-tdfire-binary/command/assemble'
 require 'cocoapods-tdfire-binary/command/lib'
+require 'cocoapods-tdfire-binary/command/delete'
+require 'cocoapods-tdfire-binary/command/search'
+require 'cocoapods-tdfire-binary/command/list'
+require 'cocoapods-tdfire-binary/command/init'
+require 'cocoapods-tdfire-binary/binary_config'
 
 module Pod
 	class Command
@@ -15,17 +20,16 @@ module Pod
 				2Dfire 二进制工具库，提供打包、lint、推送、拉取、发布等命令
       DESC
 
-			FIRE_FLAG = "2dfire"
-			# FIRE_FLAG = "private"
+			def binary_config
+				Tdfire::BinaryConfig.instance
+			end
 
       def first_podspec
       	Dir["#{Dir.pwd}/*.podspec"].first
 			end
 
-			def fire_sources
-				config.sources_manager.all.select do |source|
-					source.url.downcase.include? FIRE_FLAG
-				end
+			def private_sources
+				binary_config.private_sources
 			end
 		end
 	end

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

@@ -0,0 +1,39 @@
+require 'cocoapods-tdfire-binary/binary_url_manager'
+
+module Pod
+  class Command
+    class Binary < Command
+      class Delete < Binary
+
+        self.abstract_command = false
+        self.summary = '删除二进制版本'
+        self.description = <<-DESC
+					将二进制从服务器中删除
+        DESC
+
+        self.arguments = [
+            CLAide::Argument.new('NAME', true),
+            CLAide::Argument.new('VERSION', true)
+        ]
+
+        def initialize(argv)
+          @name = argv.shift_argument
+          @version = argv.shift_argument
+          super
+        end
+
+        def validate!
+          super
+          help! "必须为删除组件指定名称" if @name.nil?
+          help! "必须为删除组件指定版本" if @version.nil?
+        end
+
+        def run
+          UI.section("Tdfire: deleting binary file #{@name} #{@version} ...") do
+            Pod::Tdfire::BinaryUrlManager.delete_binary(@name, @version)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+require 'cocoapods-tdfire-binary/binary_url_manager'
+require 'cocoapods-tdfire-binary/init_asker'
+
+module Pod
+  class Command
+    class Binary < Command
+      class Init < Binary
+
+        self.abstract_command = false
+        self.summary = '初始化二进制插件'
+        self.description = <<-DESC
+					初始化二进制插件
+        DESC
+
+        def initialize(argv)
+          @asker = Tdfire::InitAsker.new
+          super
+        end
+
+        def run
+          @asker.wellcome_message
+
+          hash = binary_config.setting_hash
+
+          Tdfire::InitAsker::QUESTIONS.each do |k, v|
+            hash[k] = @asker.ask_with_answer(v, hash[k])
+          end
+
+          binary_config.config_with_setting(hash)
+
+          @asker.done_message
+        end
+      end
+    end
+  end
+end

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

@@ -9,8 +9,8 @@ module Pod
 			self.summary = '二进制模版库操作'
 			self.description = <<-DESC
 				二进制模版库操作
-      DESC
-      end
+	DESC
+	end
 		end
 	end
 end

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

@@ -15,13 +15,16 @@ module Pod
 							['--sources', '私有源地址'],
 							['--clean', '执行成功后，删除 zip 文件外的所有生成文件'],
 							['--one-binary', '只让 Lint 的 Pod 进行二进制依赖，其余都用源码'],
+							['--subspec', 'lint 特定 subspec']
 					].concat(super)
 				end
 
 				def initialize(argv)
 					@clean = argv.flag?('clean')
 					@sources = argv.option('sources')
+					@subspec = argv.option('subspec')
 					@one_binary = argv.flag?('one-binary')
+
 					@spec_file = first_podspec
 					@spec_name = @spec_file.split('/').last.split('.').first unless @spec_file.nil?
 					unzip_framework
@@ -57,6 +60,8 @@ module Pod
 							'--verbose'
 					]
 
+					argvs << "--subspec=#{@subspec}" unless @subspec.nil?
+
 					lint= Pod::Command::Lib::Lint.new(CLAide::ARGV.new(argvs))
 					lint.validate!
 					lint.run

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

@@ -0,0 +1,38 @@
+
+require 'json'
+require 'cocoapods-tdfire-binary/binary_url_manager'
+
+module Pod
+  class Command
+    class Binary < Command
+      class List < Binary
+
+        self.abstract_command = false
+        self.summary = '查看所有二进制版本信息'
+        self.description = <<-DESC
+					查看所有二进制版本信息
+        DESC
+
+        def initialize(argv)
+          super
+        end
+
+        def validate!
+          super
+        end
+
+        def run
+          result = Pod::Tdfire::BinaryUrlManager.list_binary
+          pods = JSON.parse(result) unless result.nil?
+          pods ||= []
+
+          pods.sort.each do |pod, versions|
+            UI.puts "  #{pod + " " + versions.last}\n"
+          end
+
+          UI.puts "\n#{pods.keys.count} pods were found"
+        end
+      end
+    end
+  end
+end

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

@@ -19,7 +19,8 @@ module Pod
             ['--clean', '执行成功后，删除 zip 文件外的所有生成文件'],
             ['--spec-sources', '私有源地址'],
             # ['--local', '使用本地代码'],
-            ['--use-carthage', 'carthage使用carthage进行打包'],
+            ['--use-carthage', 'carthage使用carthage进行打包，三方库提供carthage的优先'],
+						['--subspecs', '打包子组件']
           ].concat(super)
         end
 
@@ -28,6 +29,7 @@ module Pod
           @local = argv.flag?('local')
           @use_carthage = argv.flag?('use-carthage')
 	      	@spec_sources = argv.option('spec-sources')
+					@subspecs= argv.option('subspecs')
 	      	@spec_file = first_podspec
 	      	super
 	      end
@@ -38,18 +40,57 @@ module Pod
         end
 
         def run
-          # 组件有多个 platform 时，限制 cocoapods-packager 只打 ios 代码
-          Pod::Tdfire::BinaryStateStore.limit_platform = true
-
-        	spec = Specification.from_file(@spec_file)
-          prepare(spec)
-        	package(spec)
-        	zip(spec)
-
-          Pod::Tdfire::BinaryStateStore.limit_platform = false
+					if @use_carthage
+						build_by_carthage
+					else
+						build_by_pod_packager
+					end
         end
 
         private
+				def build_by_pod_packager
+					# 组件有多个 platform 时，限制 cocoapods-packager 只打 ios 代码
+					Pod::Tdfire::BinaryStateStore.limit_platform = true
+
+					spec = Specification.from_file(@spec_file)
+					prepare(spec)
+					package(spec)
+					zip_packager_framework(spec)
+
+					Pod::Tdfire::BinaryStateStore.limit_platform = false
+				end
+
+				def build_by_carthage
+					build_script = <<-EOF
+if [[ -d swift-staticlibs ]]; then
+	rm -fr swift-staticlibs 
+fi
+
+if [[ ! $(command -v carthage) ]]; then
+	brew install carthage 
+fi
+
+git clone git@git.2dfire-inc.com:cocoapods-repos/swift-staticlibs.git					
+
+xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX)
+trap 'rm -f "$xcconfig"' INT TERM HUP EXIT
+
+echo "LD = $PWD/swift-staticlibs/ld.py" >> $xcconfig
+echo "DEBUG_INFORMATION_FORMAT = dwarf" >> $xcconfig
+
+export XCODE_XCCONFIG_FILE="$xcconfig"
+
+carthage build "$@" --no-skip-current --platform iOS
+
+rm -fr swift-staticlibs
+					EOF
+
+					system build_script
+
+					spec = Specification.from_file(@spec_file)
+					zip_carthage_framework(spec)
+				end
+
 
         def prepare(spec)
           UI.section("Tdfire: prepare for packaging ...") do
@@ -68,6 +109,7 @@ module Pod
             ]
 
             argvs << "--local" if @local
+						argvs << "--subspecs=#{@subspecs}" unless @subspecs.nil?
             
             package = Pod::Command::Package.new(CLAide::ARGV.new(argvs))
             package.validate!
@@ -75,7 +117,7 @@ module Pod
 	        end
         end
 
-        def zip(spec)
+        def zip_packager_framework(spec)
 					framework_directory = "#{spec.name}-#{spec.version}/ios"
 					framework_name = "#{spec.name}.framework"
 					framework_path = "#{framework_directory}/#{framework_name}"
@@ -86,8 +128,11 @@ module Pod
 					# 这里把多余的 bundle 删除
 					# https://github.com/CocoaPods/cocoapods-packager/pull/199
 					resource_bundles = spec.tdfire_recursive_value('resource_bundles').map(&:keys).flatten.uniq
+					resources= spec.tdfire_recursive_value('resources').map { |r| r.split('/').last }
 					FileUtils.chdir("#{framework_path}/Versions/A/Resources") do
-						dependency_bundles = Dir.glob('*.bundle').select { |b| !resource_bundles.include?(b.split('.').first) }
+						dependency_bundles = Dir.glob('*.bundle').select do |b|
+							!resource_bundles.include?(b.split('.').first) && !resources.include?(b)
+						end
 						unless dependency_bundles.empty?
 							Pod::UI::puts "Tdfire: remove dependency bundles: #{dependency_bundles.join(', ')}"
 
@@ -97,18 +142,33 @@ module Pod
 						end
 					end if File.exist? "#{framework_path}/Versions/A/Resources"
 
-        	output_name = "#{framework_name}.zip"
-        	UI.section("Tdfire: zip #{framework_path} ...") do
+        	zip_framework(spec, framework_directory)
+
+					clean(spec) if @clean
+				end
+
+				def zip_carthage_framework(spec)
+					framework_directory = "Carthage/Build/iOS"
+					framework_name = "#{spec.name}.framework"
+					framework_path = "#{framework_directory}/#{framework_name}"
+
+					raise Informative, "没有需要压缩的 framework 文件：#{framework_path}" unless File.exist?(framework_path)
+
+					zip_framework(spec, framework_directory)
+				end
+
+				def zip_framework(spec, framework_directory)
+					framework_name = "#{spec.name}.framework"
+					output_name = "#{framework_name}.zip"
+					UI.section("Tdfire: zip #{framework_directory}/#{framework_name} ...") do
 						FileUtils.chdir(framework_directory) do
 							system "zip --symlinks -r #{output_name} #{framework_name}"
-							system "mv #{output_name} ../../"
+							system "mv #{output_name} #{framework_directory.split('/').count.times.reduce("") { |r, n| r + "../" }}"
 						end
 					end
 
 					Pod::UI::puts "Tdfire: save framework zip file to #{Dir.pwd}/#{output_name}".green
-
-					clean(spec) if @clean
-        end
+				end
 
         def clean(spec)
           file = "#{spec.name}-#{spec.version}"

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

@@ -37,7 +37,7 @@ module Pod
 
           UI.section("Tdfire: start publishing #{spec.name} ...") do
             argvs = [
-                fire_sources.first.name,
+                private_sources.first.name,
                 @spec_file,
                 '--allow-warnings',
                 '--use-libraries',
@@ -53,7 +53,7 @@ module Pod
 
         private
         def commit_prefix(spec)
-          output_path = fire_sources.first.pod_path(spec.name) + spec.version.to_s
+          output_path = private_sources.first.pod_path(spec.name) + spec.version.to_s
           if output_path.exist?
             message = "[Fix] #{spec}"
           elsif output_path.dirname.directory?

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

@@ -0,0 +1,47 @@
+
+require 'json'
+require 'cocoapods-tdfire-binary/binary_url_manager'
+
+module Pod
+  class Command
+    class Binary < Command
+      class Search < Binary
+
+        self.abstract_command = false
+        self.summary = '查找二进制版本信息'
+        self.description = <<-DESC
+					查找二进制版本信息
+        DESC
+
+        self.arguments = [
+            CLAide::Argument.new('NAME', true)
+        ]
+
+        def initialize(argv)
+          @name = argv.shift_argument
+          super
+        end
+
+        def validate!
+          super
+          help! "必须指定有效组件名" if @name.nil?
+        end
+
+        def run
+          result = Pod::Tdfire::BinaryUrlManager.search_binary(@name)
+          pod = JSON.parse(result) unless result.nil?
+          pod ||= {'' => []}
+
+          name = pod['name'] || @name
+          versions = pod['versions'] || []
+
+          title = "-> #{name} (#{versions.last})".green
+
+          Pod::UI::title(title, '', 1) do
+            Pod::UI::labeled('Versions', versions.join(', '))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module CocoapodsTdfireBinary
-  VERSION = "1.0.10"
+  VERSION = "1.1.0"
 end

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

@@ -0,0 +1,55 @@
+require 'cocoapods-tdfire-binary/binary_config'
+
+module Pod
+  module Tdfire
+    class InitAsker
+      QUESTIONS = {
+          BinaryConfig::SERVER_ROOT_KEY => '输入二进制服务器地址 (比如 http://xxxxx:8080)',
+          BinaryConfig::REPO_URL_KEY => '输入私有源 Git 地址 (比如 https://github.com/tripleCC/PrivateSpecRepo.git)',
+          BinaryConfig::TEMPLATE_URL_KEY => '输入 pod 模版 Git 地址 (比如 https://github.com/CocoaPods/pod-template.git)'
+      }
+
+      def show_prompt
+        print ' > '.green
+      end
+
+      def ask_with_answer(question, pre_answer)
+        print "\n#{question}\n"
+
+        print "旧值：#{pre_answer}\n" unless pre_answer.nil?
+
+        answer = ''
+        loop do
+          show_prompt
+          answer = STDIN.gets.chomp
+
+          if answer == '' && !pre_answer.nil?
+            answer = pre_answer
+            print answer.yellow
+            print "\n"
+          end
+
+          break unless answer.empty?
+        end
+
+        answer
+      end
+
+      def wellcome_message
+        print <<-EOF
+
+开始设置二进制化初始信息.
+所有的信息都会保存在 binary_config.yaml 文件中.
+你可以在 #{BinaryConfig.instance.binary_setting_file} 目录下手动添加编辑该文件.
+#{BinaryConfig.instance.binary_setting_file} 文件包含配置信息如下：
+
+#{QUESTIONS.to_yaml}
+EOF
+      end
+
+      def done_message
+        print "\n设置完成.\n"
+      end
+    end
+  end
+end

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

@@ -40,8 +40,6 @@ module Pod
             Pod::Tdfire::BinaryStateStore.printed_pods << root.name
           end
 
-          yield self if block_given?
-
           # name 一定要有，否则 subspec dependecy 会出现 split nil 错误
           @tdfire_reference_spec = Specification.new(nil, 'TdfireSpecification')
           configurator.call @tdfire_reference_spec
@@ -53,6 +51,8 @@ module Pod
           else
             tdfire_refactor.configure_binary(@tdfire_reference_spec)
           end
+
+          yield self if block_given?
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdfire-binary
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.1.0
 platform: ruby
 authors:
 - tripleCC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,7 +73,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bundle/config"
 - ".gitignore"
+- ".travis.yml"
+- ".vscode/launch.json"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -81,20 +84,26 @@ files:
 - Rakefile
 - cocoapods-tdfire-binary.gemspec
 - lib/cocoapods-tdfire-binary.rb
+- lib/cocoapods-tdfire-binary/binary_config.rb
 - lib/cocoapods-tdfire-binary/binary_specification_refactor.rb
 - lib/cocoapods-tdfire-binary/binary_state_store.rb
 - lib/cocoapods-tdfire-binary/binary_url_manager.rb
 - lib/cocoapods-tdfire-binary/command.rb
 - lib/cocoapods-tdfire-binary/command/assemble.rb
 - lib/cocoapods-tdfire-binary/command/binary.rb
+- lib/cocoapods-tdfire-binary/command/delete.rb
+- lib/cocoapods-tdfire-binary/command/init.rb
 - lib/cocoapods-tdfire-binary/command/lib.rb
 - lib/cocoapods-tdfire-binary/command/lib/create.rb
 - lib/cocoapods-tdfire-binary/command/lint.rb
+- lib/cocoapods-tdfire-binary/command/list.rb
 - lib/cocoapods-tdfire-binary/command/package.rb
 - lib/cocoapods-tdfire-binary/command/publish.rb
 - lib/cocoapods-tdfire-binary/command/pull.rb
 - lib/cocoapods-tdfire-binary/command/push.rb
+- lib/cocoapods-tdfire-binary/command/search.rb
 - lib/cocoapods-tdfire-binary/gem_version.rb
+- lib/cocoapods-tdfire-binary/init_asker.rb
 - lib/cocoapods-tdfire-binary/podfile_dsl.rb
 - lib/cocoapods-tdfire-binary/podfile_hook.rb
 - lib/cocoapods-tdfire-binary/source_chain_analyzer.rb