cocoapods-bin 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 397354181f9f9ab4ce7e462c4583f8d87ece5d7c
-  data.tar.gz: 21c9a9409b99972a592567df8e60e97d5b5b7da1
+  metadata.gz: 560ddbfb4258324c1e3dbcf1c35fa58fcd238b7e
+  data.tar.gz: b02c0f9c578eed09d6cb850593beded52b7c6f82
 SHA512:
-  metadata.gz: deaea76a36d15e7a706b15f8b575ca2efc2d65bc8ae67e27799514928439ee6529637e232dd9efd28797794b1f1735f32c6e9e04d385fe05076149e81142247f
-  data.tar.gz: 7f0a12aad14d315d5bc67dfadacab6bd89d33dd1ff52dd04d253c9fa2343d26fc71944cecb5409fc8da81bc7195f508680b0d79dfdb35715c7fa25aec8b2cb8b
+  metadata.gz: b5ebe970aeca3cc85adbe7615783406569d98dcc4de4eadb658cf6e2c05a43fc5b8fa2d7bd9a2cf6917b0a51160afe4992243b534835716d4798b99796f6c227
+  data.tar.gz: 50f193d2d9c6f37a5d1201c7fac572800f968671f970e2afc5ff3a65e0bd646000dfc8ef242f7f4eabb8adf5479495d21877a6d0668729a528c4135b63cad9bf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-bin (0.0.1)
+    cocoapods-bin (0.0.2)
       cocoapods (~> 1.4)
       parallel
 

data/lib/cocoapods-bin/command/bin/lib/lint.rb

@@ -18,6 +18,7 @@ module Pod
           def self.options
             [
               ['--binary', 'lint 组件的二进制版本'],
+              ['--template-podspec=A.binary-template.podspec', '生成拥有 subspec 的二进制 spec 需要的模版 podspec, 插件会更改 version 和 source'],
               ['--code-dependencies', '使用源码依赖进行 lint'],
               ['--loose-options', '添加宽松的 options, 可能包括 --use-libraries (可能会造成 entry point (start) undefined)'],
               ['--reserve-created-spec', '保留生成的二进制 spec 文件'],
@@ -31,6 +32,7 @@ module Pod
             @code_dependencies = argv.flag?('code-dependencies')
             @sources = argv.option('sources') || []
             @reserve_created_spec = argv.flag?('reserve-created-spec')
+            @template_podspec = argv.option('template-podspec')
             super
 
             @additional_args = argv.remainder!
@@ -39,54 +41,56 @@ module Pod
           def run 
             Podfile.execute_with_use_binaries(!@code_dependencies) do 
               argvs = [
-                spec_file,
                 "--sources=#{sources_option(@code_dependencies, @sources)}",
                 *@additional_args
               ]
+
+              argvs << spec_file if spec_file
               
               if @loose_options
                 argvs << '--allow-warnings'
-                argvs << '--use-libraries' if spec.all_dependencies.any?
+                argvs << '--use-libraries' if code_spec.all_dependencies.any?
               end
             
-
               lint = Pod::Command::Lib::Lint.new(CLAide::ARGV.new(argvs))
               lint.validate!
               lint.run
             end
           ensure
-            @spec_generator.clear_spec_file if @spec_generator && !@reserve_created_spec
+            clear_binary_spec_file_if_needed
           end
 
           private
 
-          def spec 
-            Pod::Specification.from_file(spec_file)
+
+          def template_spec_file
+            @template_spec_file ||= begin
+              if @template_podspec
+                find_spec_file(@template_podspec) 
+              else 
+                binary_template_spec_file
+              end
+            end
           end
 
           def spec_file
             @spec_file ||= begin
               if @podspec
-                path = Pathname(@podspec)
-                raise Informative, "Couldn't find #{@podspec}" unless path.exist?
-                path
+                find_spec_file(@podspec) 
               else
-                raise Informative, "Couldn't find any podspec files in current directory" if spec_files.empty?
-                raise Informative, "Couldn't find any code podspec files in current directory" if code_spec_files.empty? && !@binary
-                path = code_spec_files.first
-                path = binary_spec_files.first || generate_binary_spec_file(path) if @binary
-                path
+                raise Informative, "当前目录下没有找到可用源码 podspec." if code_spec_files.empty?
+
+                spec_file = if @binary
+                              code_spec = Pod::Specification.from_file(code_spec_files.first)
+                              template_spec = Pod::Specification.from_file(template_spec_file) if template_spec_file
+                              create_binary_spec_file(code_spec, template_spec)
+                            else
+                              code_spec_files.first
+                            end
+                spec_file
               end
             end
           end
-
-          def generate_binary_spec_file(code_spec_path)
-            spec = Pod::Specification.from_file(code_spec_path)
-            @spec_generator = CBin::SpecGenerator.new(spec)
-            @spec_generator.generate
-            @spec_generator.write_to_spec_file
-            @spec_generator.filename
-          end
         end
       end
     end

data/lib/cocoapods-bin/command/bin/open.rb

@@ -27,7 +27,6 @@ module Pod
 	          command.run
 	      	end
 
-
 	      	path = find_in_children(Pathname.pwd.children, @deep) || 
 	      		find_in_parent(Pathname.pwd.parent, @deep)
 	      	if path

data/lib/cocoapods-bin/command/bin/repo/push.rb

@@ -18,6 +18,7 @@ module Pod
           def self.options
             [
               ['--binary', '发布组件的二进制版本'],
+              ['--template-podspec=A.binary-template.podspec', '生成拥有 subspec 的二进制 spec 需要的模版 podspec, 插件会更改 version 和 source'],
               ['--code-dependencies', '使用源码依赖进行 lint'],
               ['--loose-options', '添加宽松的 options, 可能包括 --use-libraries (可能会造成 entry point (start) undefined)'],
               ['--reserve-created-spec', '保留生成的二进制 spec 文件'],
@@ -31,6 +32,7 @@ module Pod
             @code_dependencies = argv.flag?('code-dependencies')
             @sources = argv.option('sources') || []
             @reserve_created_spec = argv.flag?('reserve-created-spec')
+            @template_podspec = argv.option('template-podspec')
             super
 
             @additional_args = argv.remainder!
@@ -40,14 +42,15 @@ module Pod
             Podfile.execute_with_use_binaries(!@code_dependencies) do 
               argvs = [
                 repo,
-                spec_file,
                 "--sources=#{sources_option(@code_dependencies, @sources)}",
                 *@additional_args
               ]
 
+              argvs << spec_file if spec_file
+
               if @loose_options
                 argvs += ['--allow-warnings', '--use-json']
-                argvs << '--use-libraries' if spec.all_dependencies.any?
+                argvs << '--use-libraries' if code_spec.all_dependencies.any?
               end
             
               push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))
@@ -55,39 +58,40 @@ module Pod
               push.run
             end
           ensure
-            @spec_generator.clear_spec_file if @spec_generator && !@reserve_created_spec
+            clear_binary_spec_file_if_needed
           end
 
           private
 
-          def spec 
-            Pod::Specification.from_file(spec_file)
+          def template_spec_file
+            @template_spec_file ||= begin
+              if @template_podspec
+                find_spec_file(@template_podspec) 
+              else 
+                binary_template_spec_file
+              end
+            end
           end
 
           def spec_file
             @spec_file ||= begin
               if @podspec
-                path = Pathname(@podspec)
-                raise Informative, "Couldn't find #{@podspec}" unless path.exist?
-                path
+                find_spec_file(@podspec) 
               else
-                raise Informative, "Couldn't find any podspec files in current directory" if spec_files.empty?
-                raise Informative, "Couldn't find any code podspec files in current directory" if code_spec_files.empty? && !@binary
-                path = code_spec_files.first
-                path = binary_spec_files.first || generate_binary_spec_file(path) if @binary
-                path
+                raise Informative, "当前目录下没有找到可用源码 podspec." if code_spec_files.empty?
+
+                spec_file = if @binary
+                              code_spec = Pod::Specification.from_file(code_spec_files.first)
+                              template_spec = Pod::Specification.from_file(template_spec_file) if template_spec_file
+                              create_binary_spec_file(code_spec, template_spec)
+                            else
+                              code_spec_files.first
+                            end
+                spec_file
               end
             end
           end
 
-          def generate_binary_spec_file(code_spec_path)
-            spec = Pod::Specification.from_file(code_spec_path)
-            @spec_generator = CBin::SpecGenerator.new(spec)
-            @spec_generator.generate
-            @spec_generator.write_to_spec_file
-            @spec_generator.filename
-          end
-
           def repo
             @binary ? binary_source.name : code_source.name 
           end

data/lib/cocoapods-bin/command/bin/spec/create.rb

@@ -1,4 +1,4 @@
-require 'cocoapods-bin/helpers/spec_generator'
+require 'cocoapods-bin/helpers'
 
 module Pod
   class Command
@@ -10,53 +10,53 @@ module Pod
             根据源码 podspec 文件，创建对应的二进制 podspec 文件.
           DESC
 
-          self.arguments = [
-            CLAide::Argument.new('NAME.podspec', false),
-          ]
-
           def self.options
             [
               ['--platforms=ios', '生成二进制 spec 支持的平台'],
+              ['--template-podspec=A.binary-template.podspec', '生成拥有 subspec 的二进制 spec 需要的模版 podspec, 插件会更改 version 和 source'],
               ['--no-overwrite', '不允许覆盖']
             ].concat(super)
           end
 
           def initialize(argv)
-            @platforms = argv.option('platforms') || 'ios'
+            @platforms = argv.option('platforms', 'ios') 
             @allow_overwrite = argv.flag?('overwrite', true)
+            @template_podspec = argv.option('template-podspec')
             @podspec = argv.shift_argument
             super
           end
 
           def run 
+            UI.puts "开始读取 podspec 文件...\n"
 
-            UI.puts "开始读取 #{podspec_file} 文件...\n"
-            spec = Pod::Specification.from_file(podspec_file)
-
-            UI.puts "开始生成二进制 podspec 文件...\n"
-            spec_generator = CBin::SpecGenerator.new(spec, @platforms)
-            spec_generator.generate
-
-            UI.puts "开始保存 #{spec_generator.filename} 文件至当前目录...\n"
+            code_spec = Pod::Specification.from_file(spec_file)
+            template_spec = Pod::Specification.from_file(template_spec_file) if template_spec_file
 
-            if File.exist?(spec_generator.filename) && !@allow_overwrite
-              UI.warn "二进制 podspec 文件 #{spec_generator.filename} 已存在.\n"
+            if binary_spec && !@allow_overwrite
+              UI.warn "二进制 podspec 文件 #{binary_spec_files.first} 已存在.\n"
             else
-              spec_generator.write_to_spec_file
-              UI.puts "创建二进制 podspec 文件成功.\n".green
+              UI.puts "开始生成二进制 podspec 文件...\n"
+              spec_file = create_binary_spec_file(code_spec, template_spec)
+              UI.puts "创建二进制 podspec 文件 #{spec_file} 成功.\n".green
             end
           end
 
-          private 
+          def template_spec_file
+            @template_spec_file ||= begin
+              if @template_podspec
+                find_spec_file(@template_podspec) 
+              else 
+                binary_template_spec_file
+              end
+            end
+          end
 
-          def podspec_file
-            @podspec_file ||= begin
+          def spec_file
+            @spec_file ||= begin
               if @podspec
-                path = Pathname(@podspec)
-                raise Informative, "Couldn't find #{@podspec}" unless path.exist?
-                path
+                find_spec_file(@podspec) 
               else
-                raise Informative, "Couldn't find any valid podspec files in current directory" if code_spec_files.empty?
+                raise Informative, "当前目录下没有找到可用源码 podspec." if code_spec_files.empty?
                 code_spec_files.first
               end
             end

data/lib/cocoapods-bin/gem_version.rb

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end
 
 module Pod

data/lib/cocoapods-bin/helpers/spec_creator.rb

@@ -0,0 +1,110 @@
+require 'cocoapods'
+require 'cocoapods-bin/config/config'
+
+module CBin
+	class Specification
+		class Creator
+			attr_reader :code_spec
+			attr_reader :template_spec
+			attr_reader :spec
+
+			def initialize(code_spec, template_spec, platforms = 'ios') 
+				@code_spec = code_spec
+				@template_spec = template_spec
+				@platforms = Array(platforms)
+				validate!			
+			end
+
+			def validate!
+				raise Pod::Informative, "源码 podspec 不能为空 ."  unless code_spec
+				raise Pod::Informative, "不支持自动生成存在 subspec 的二进制 podspec , 需要提供模版文件 #{code_spec.name}.binary.podspec.template ."  if code_spec.subspecs.any? && template_spec.nil?
+			end
+
+			def create
+				spec = template_spec ? create_from_code_spec_and_template_spec : create_from_code_spec
+
+				Pod::UI.message "生成二进制 podspec 内容: "
+	      spec.to_pretty_json.split("\n").each do |text|
+	        Pod::UI.message text
+	      end
+
+	      spec
+			end
+
+			def write_spec_file(file = filename)
+				create unless spec
+
+				File.open(file, 'w+') do |f|
+	        f.write(spec.to_pretty_json)
+	      end
+
+	      @filename = file 
+			end
+
+			def clear_spec_file
+				File.delete(filename) if File.exist?(filename)
+			end
+
+			def filename 
+				@filename ||= "#{spec.name}.binary.podspec.json" 
+			end
+
+			private
+
+			def create_from_code_spec
+				@spec = code_spec.dup
+				# vendored_frameworks | resources | source | source_files | public_header_files
+				# license | resource_bundles
+
+				# Project Linkin
+				@spec.vendored_frameworks = "#{code_spec.root.name}.framework"
+
+				# Resources
+				extnames = []
+				extnames << '*.bundle' if code_spec_consumer.resource_bundles.any?
+				extnames += code_spec_consumer.resources.map { |r| File.basename(r) } if code_spec_consumer.resources.any?
+				@spec.resources = framework_contents('Resources').flat_map { |r| extnames.map { |e| "#{r}/#{e}" } } if extnames.any?
+
+				# Source Location
+				@spec.source = binary_source
+
+				# Source Code
+				@spec.source_files = framework_contents('Headers/*')
+				@spec.public_header_files = framework_contents('Headers/*')
+
+				# Unused for binary 
+				spec_hash = @spec.to_hash
+				# spec_hash.delete('license')
+				spec_hash.delete('resource_bundles')
+
+				# Filter platforms
+				platforms = spec_hash['platforms']
+				selected_platforms = platforms.select { |k, v| @platforms.include?(k) } 
+				spec_hash['platforms'] = selected_platforms.empty? ? platforms : selected_platforms
+	 
+				@spec = Pod::Specification.from_hash(spec_hash)
+				@spec
+			end
+
+			def create_from_code_spec_and_template_spec
+				@spec = template_spec.dup
+
+				@spec.version = code_spec.version
+				@spec.source = binary_source
+	      @spec
+			end
+
+			def binary_source
+				{ http: CBin.config.binary_download_url % [code_spec.root.name, code_spec.version] } 
+			end
+
+			def code_spec_consumer(platform = :ios)
+				code_spec.consumer(:ios)
+			end
+
+			def framework_contents(name)
+				["#{code_spec.root.name}.framework", "#{code_spec.root.name}.framework/Versions/A"].map { |path| "#{path}/#{name}" }
+			end
+		end
+	end
+end

data/lib/cocoapods-bin/helpers/spec_files_helper.rb

@@ -10,8 +10,50 @@ module CBin
       @binary_spec_files ||= Pathname.glob('*.binary.podspec{,.json}')
     end
 
+    def binary_template_spec_file
+      @binary_spec_template_file ||= Pathname.glob('*.binary-template.podspec{,.json}').first
+    end 
+
     def code_spec_files
       @code_spec_files ||= spec_files - binary_spec_files
     end
+
+    def code_spec 
+      Pod::Specification.from_file(code_spec_files.first) if code_spec_files.first
+    end
+
+    def binary_spec 
+      Pod::Specification.from_file(binary_spec_files.first) if binary_spec_files.first
+    end
+
+    def binary_template_spec
+      Pod::Specification.from_file(binary_template_spec_file) if binary_template_spec_file
+    end 
+
+    def find_spec_file(podspec)
+      path = Pathname(podspec)
+      raise Pod::Informative, "无法找到 #{podspec}" unless path.exist?
+      path 
+    end
+
+    def create_binary_spec_file(code_spec, template_spec)
+      # 1. code spec 是否有 subpsec
+      # 1.1 有，查找 template spec，并生成
+      # 1.2 没有，是否有 template spec
+      # 1.2.1 有，根据 template spec 生成
+      # 1.2.2 没有，根据 code spec 生成
+
+      raise Pod::Informative, "没有二进制 podspec 的情况下，必须要提供源码 podspec." unless code_spec
+      raise Pod::Informative, "拥有 subspec 的组件，在生成二进制 podspec 时，必须要提供模版 podspec." if code_spec.subspecs.any? && template_spec.nil?
+
+      @spec_creator = CBin::Specification::Creator.new(code_spec, template_spec)
+      @spec_creator.create
+      @spec_creator.write_spec_file
+      @spec_creator.filename
+    end
+
+    def clear_binary_spec_file_if_needed
+     @spec_creator.clear_spec_file if @spec_creator
+    end
 	end
 end

data/lib/cocoapods-bin/helpers.rb

@@ -1,3 +1,3 @@
 require 'cocoapods-bin/helpers/sources_helper'
-require 'cocoapods-bin/helpers/spec_generator'
+require 'cocoapods-bin/helpers/spec_creator'
 require 'cocoapods-bin/helpers/spec_files_helper'

data/lib/cocoapods-bin/native/acknowledgements.rb

@@ -0,0 +1,24 @@
+module Pod
+  module Generator
+    class Acknowledgements
+    	def license_text(spec)
+        return nil unless spec.license
+        text = spec.license[:text]
+        unless text
+          if license_file = spec.license[:file]
+            license_path = file_accessor(spec).root + license_file
+            if File.exist?(license_path)
+              text = IO.read(license_path)
+            else
+              # UI.warn "Unable to read the license file `#{license_file}` " \
+              # "for the spec `#{spec}`"
+            end
+          elsif license_file = file_accessor(spec).license
+            text = IO.read(license_file)
+          end
+        end
+        text
+      end
+    end
+  end
+end

data/lib/cocoapods-bin/native/installer.rb

@@ -11,45 +11,80 @@ module Pod
 			installer
 		end
 
-		# rewrite install_pod_sources
 		alias_method :old_install_pod_sources, :install_pod_sources
     def install_pod_sources
     	if installation_options.install_with_multi_processes
-	      @installed_specs = []
-	      pods_to_install = sandbox_state.added | sandbox_state.changed
-	      title_options = { :verbose_prefix => '-> '.green }
-	      # 多进程下载，多线程时 log 会显著交叉，多进程好点，但是多进程需要利用文件锁对 cache 进行保护
-	      # in_processes: 10
-	      Parallel.each(root_specs.sort_by(&:name), in_threads: 10) do |spec|
-	        if pods_to_install.include?(spec.name)
-	          if sandbox_state.changed.include?(spec.name) && sandbox.manifest
-	            current_version = spec.version
-	            previous_version = sandbox.manifest.version(spec.name)
-	            has_changed_version = current_version != previous_version
-	            current_repo = analysis_result.specs_by_source.detect { |key, values| break key if values.map(&:name).include?(spec.name) }
-	            current_repo &&= current_repo.url || current_repo.name
-	            previous_spec_repo = sandbox.manifest.spec_repo(spec.name)
-	            has_changed_repo = !previous_spec_repo.nil? && current_repo && (current_repo != previous_spec_repo)
-	            title = "Installing #{spec.name} #{spec.version}"
-	            title << " (was #{previous_version} and source changed to `#{current_repo}` from `#{previous_spec_repo}`)" if has_changed_version && has_changed_repo
-	            title << " (was #{previous_version})" if has_changed_version && !has_changed_repo
-	            title << " (source changed to `#{current_repo}` from `#{previous_spec_repo}`)" if !has_changed_version && has_changed_repo
-	          else
-	            title = "Installing #{spec}"
-	          end
-	          UI.titled_section(title.green, title_options) do
-	            install_source_of_pod(spec.name)
-	          end
-	        else
-	          UI.titled_section("Using #{spec}", title_options) do
-	            create_pod_installer(spec.name)
-	          end
-	        end
-	      end
-	    else
+	  		if Pod.match_version?('~> 1.4.0')
+	  			install_pod_sources_for_version_in_1_4_0
+	  		elsif Pod.match_version?('~> 1.5')
+  				install_pod_sources_for_version_above_1_5_0
+  			else 
+  				old_install_pod_sources
+	  		end     
+      else
 	    	old_install_pod_sources
 	    end
     end
+
+
+		# rewrite install_pod_sources
+		def install_pod_sources_for_version_in_1_4_0
+			@installed_specs = []
+      pods_to_install = sandbox_state.added | sandbox_state.changed
+      title_options = { :verbose_prefix => '-> '.green }
+      Parallel.each(root_specs.sort_by(&:name), in_threads: 10) do |spec|
+        if pods_to_install.include?(spec.name)
+          if sandbox_state.changed.include?(spec.name) && sandbox.manifest
+            previous = sandbox.manifest.version(spec.name)
+            title = "Installing #{spec.name} #{spec.version} (was #{previous})"
+          else
+            title = "Installing #{spec}"
+          end
+          UI.titled_section(title.green, title_options) do
+            install_source_of_pod(spec.name)
+          end
+        else
+          UI.titled_section("Using #{spec}", title_options) do
+            create_pod_installer(spec.name)
+          end
+        end
+      end
+		end
+
+		def install_pod_sources_for_version_above_1_5_0
+			@installed_specs = []
+      pods_to_install = sandbox_state.added | sandbox_state.changed
+      title_options = { :verbose_prefix => '-> '.green }
+      # 多进程下载，多线程时 log 会显著交叉，多进程好点，但是多进程需要利用文件锁对 cache 进行保护
+      # in_processes: 10
+      Parallel.each(root_specs.sort_by(&:name), in_threads: 10) do |spec|
+        if pods_to_install.include?(spec.name)
+          if sandbox_state.changed.include?(spec.name) && sandbox.manifest
+            current_version = spec.version
+            previous_version = sandbox.manifest.version(spec.name)
+            has_changed_version = current_version != previous_version
+            current_repo = analysis_result.specs_by_source.detect { |key, values| break key if values.map(&:name).include?(spec.name) }
+            current_repo &&= current_repo.url || current_repo.name
+            previous_spec_repo = sandbox.manifest.spec_repo(spec.name)
+            has_changed_repo = !previous_spec_repo.nil? && current_repo && (current_repo != previous_spec_repo)
+            title = "Installing #{spec.name} #{spec.version}"
+            title << " (was #{previous_version} and source changed to `#{current_repo}` from `#{previous_spec_repo}`)" if has_changed_version && has_changed_repo
+            title << " (was #{previous_version})" if has_changed_version && !has_changed_repo
+            title << " (source changed to `#{current_repo}` from `#{previous_spec_repo}`)" if !has_changed_version && has_changed_repo
+          else
+            title = "Installing #{spec}"
+          end
+          UI.titled_section(title.green, title_options) do
+            install_source_of_pod(spec.name)
+          end
+        else
+          UI.titled_section("Using #{spec}", title_options) do
+            create_pod_installer(spec.name)
+          end
+        end
+      end
+		end
+
 	end
 
   module Downloader

data/lib/cocoapods-bin/native.rb

@@ -8,6 +8,7 @@ if Pod.match_version?('~> 1.4')
 	require 'cocoapods-bin/native/resolver'
 	require 'cocoapods-bin/native/source'
 	require 'cocoapods-bin/native/validator'
+	require 'cocoapods-bin/native/acknowledgements'
 end
 
 require 'cocoapods-bin/native/source_provider_hook'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - tripleCC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -97,9 +97,10 @@ files:
 - lib/cocoapods-bin/gem_version.rb
 - lib/cocoapods-bin/helpers.rb
 - lib/cocoapods-bin/helpers/sources_helper.rb
+- lib/cocoapods-bin/helpers/spec_creator.rb
 - lib/cocoapods-bin/helpers/spec_files_helper.rb
-- lib/cocoapods-bin/helpers/spec_generator.rb
 - lib/cocoapods-bin/native.rb
+- lib/cocoapods-bin/native/acknowledgements.rb
 - lib/cocoapods-bin/native/analyzer.rb
 - lib/cocoapods-bin/native/installation_options.rb
 - lib/cocoapods-bin/native/installer.rb

data/lib/cocoapods-bin/helpers/spec_generator.rb

@@ -1,86 +0,0 @@
-require 'cocoapods'
-require 'cocoapods-bin/config/config'
-
-module CBin
-	class SpecGenerator
-		attr_reader :ref_spec
-		attr_reader :spec
-
-		def initialize(ref_spec, platforms = 'ios') 
-			@ref_spec = ref_spec
-			@platforms = Array(platforms)
-			validate!			
-		end
-
-		def validate!
-			raise StandardError, '不支持自动生成存在 subspec 的二进制 podspec .' if ref_spec.subspecs.any?
-		end
-
-		def generate 
-			@spec = @ref_spec.dup
-			# vendored_frameworks | resources | source | source_files | public_header_files
-			# license | resource_bundles
-
-			# Project Linkin
-			@spec.vendored_frameworks = "#{ref_spec.root.name}.framework"
-
-			# Resources
-			extnames = []
-			extnames << '*.bundle' if ref_spec_consumer.resource_bundles.any?
-			extnames += ref_spec_consumer.resources.map { |r| File.basename(r) } if ref_spec_consumer.resources.any?
-			@spec.resources = framework_contents('Resources').flat_map { |r| extnames.map { |e| "#{r}/#{e}" } } if extnames.any?
-
-			# Source Location
-			@spec.source = { http: CBin.config.binary_download_url % [ref_spec.root.name, ref_spec.version] }
-
-			# Source Code
-			@spec.source_files = framework_contents('Headers/*')
-			@spec.public_header_files = framework_contents('Headers/*')
-
-			# Unused for binary 
-			spec_hash = @spec.to_hash
-			# spec_hash.delete('license')
-			spec_hash.delete('resource_bundles')
-
-			# Filter platforms
-			platforms = spec_hash['platforms']
-			selected_platforms = platforms.select { |k, v| @platforms.include?(k) } 
-			spec_hash['platforms'] = selected_platforms.empty? ? platforms : selected_platforms
- 
-			@spec = Pod::Specification.from_hash(spec_hash)
-
-			Pod::UI.message "生成二进制 podspec 内容: "
-      @spec.to_pretty_json.split("\n").each do |text|
-        Pod::UI.message text
-      end
-
-			@spec
-		end
-
-		def write_to_spec_file(file = filename)
-			File.open(file, 'w+') do |f|
-        f.write(spec.to_pretty_json)
-      end
-
-      @filename = file 
-		end
-
-		def clear_spec_file
-			File.delete(@filename) if File.exist?(@filename)
-		end
-
-		def filename 
-			@filename ||= "#{spec.name}.binary.podspec.json" 
-		end
-
-		private
-
-		def ref_spec_consumer(platform = :ios)
-			ref_spec.consumer(:ios)
-		end
-
-		def framework_contents(name)
-			["#{ref_spec.root.name}.framework", "#{ref_spec.root.name}.framework/Versions/A"].map { |path| "#{path}/#{name}" }
-		end
-	end
-end