cocoapods-external-pod-sorter 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 596f9acb3f6abd7aa7ff2ab44036b61e0f2c19dd
-  data.tar.gz: a76266f4e67d31264baecfb49a397bd6b2c55bbd
+  metadata.gz: 2a8e8e2015b8d6bee337918679b2223f5bf54c73
+  data.tar.gz: 80c37bb4b1e43c787927a674a7f9e16fba9a76b1
 SHA512:
-  metadata.gz: 9f5cb463e00cf42613dda5c74895e13dc6bebbf451e38c0c73b592695da27df5ccde19a3b19e4af1313f87fb3e64eca6d6f38b10cdfe105950e40dc6debd5fb2
-  data.tar.gz: 8c6149ce8a57bacdf5bc42853f1c804e209a4d95dc152114d64c16f9014d2a4052d833d7e071a353c034135cbe9ba0968f010d0a80acda646d81849d5b8e73a3
+  metadata.gz: c5400de0b246ab6dd760708460e5b7dd5d8fd93853938452a2f1154a683dc3e5db56597164e77a67a9f9c28b5e38e64c1a5a7397cd4990b6bb7101b697577479
+  data.tar.gz: 2ffd9ed420487ce6100333280154258432a97d3360a409615ca86c3537abf2f8bf72f0305c3aaef82dac1d093c5766e8b3307eab8770a77a415f4e58e23d48b4

data/README.md

@@ -1,6 +1,6 @@
 # cocoapods-external-pod-sorter
 
-A description of cocoapods-external-pod-sorter.
+对 Podfile 中依赖 external 的组件进行分组.
 
 ## Installation
 
@@ -8,4 +8,6 @@ A description of cocoapods-external-pod-sorter.
 
 ## Usage
 
-    $ pod spec sorter POD_NAME
+
+    $ pod sort
+

data/lib/cocoapods-external-pod-sorter/command/sorter.rb

@@ -47,9 +47,12 @@ module Pod
       def run
         config = Pod::Config.instance
         config.installation_root = Pathname.new(@project_directory) if @project_directory
-        sorter = ExternalPodSorter.new(config)
+        data_source = ExternalPodSorter::LocalDataSource.new(config)
+        sorter = ExternalPodSorter.new(data_source)
         sorter.sort
-        sorter.grouped_pods.each do |group|
+
+        if sorter.grouped_pods
+          sorter.grouped_pods.each do |group|
           group.each do |pod|
             display = pod.name.dup
             if pod.external_dependency_names.any?
@@ -61,6 +64,10 @@ module Pod
             puts display
           end
         end
+        else
+          puts '没有未依赖正式版本组件.'
+        end
+        
       end
     end
   end

data/lib/cocoapods-external-pod-sorter/external_pod_sorter.rb

@@ -4,58 +4,40 @@ require 'cocoapods-external-pod-sorter/cocoapods/sources_manager'
 require 'cocoapods-external-pod-sorter/cocoapods/specification'
 require 'cocoapods-external-pod-sorter/external_pod_sorter/pod_item'
 require 'cocoapods-external-pod-sorter/cocoapods/source'
+require 'cocoapods-external-pod-sorter/external_pod_sorter/data_source'
+require 'cocoapods-external-pod-sorter/external_pod_sorter/data_source/local_data_source'
 
 class ExternalPodSorter
 	attr_accessor :grouped_pods
 
-	def initialize(config = Pod::Config.instance)
-		@config = config
-		@untagged_dependencies = config.podfile.untagged_dependencies
+	def initialize(data_source = LocalDataSource.new)
+		@data_source = data_source
 	end
 
 	public
 	def sort
-		podfile_specs = analyze_podfile_specs
-		@grouped_pods = group_pods_by_dependency_depth(@untagged_dependencies, podfile_specs)
+		@grouped_pods = group_pods_by_dependency_depth(@data_source.untagged_dependencies, @data_source.reference_specifications)
 		@grouped_pods
 	end
 
 	private 
-
-	def analyze_podfile_specs
-		analyzer = Pod::Installer::Analyzer.new(@config.sandbox, @config.podfile, @config.lockfile)			
-		podfile_specs = @config.with_changes(skip_repo_update: true) do 
-			# allow fetch ，初次install时，或者新增external source 时，由于Pods/Local Podspecs 是空，会抛出找不到specification异常
-			begin
-				analyzer.analyze(false).specs_by_target.values.flatten(1)	
-			rescue 
-				analyzer.analyze(true).specs_by_target.values.flatten(1)
-			end
-		end
-
-		podfile_specs
-	rescue
-		puts 'Can`t fetch specs from project directory, fetch from private source cache'.yellow
-		@config.sources_manager.default_source.newest_specs
-	end
-
-	def group_pods_by_dependency_depth(untagged_dependencies, podfile_specs)
+	def group_pods_by_dependency_depth(untagged_dependencies, reference_specifications)
 		result = []
 
 		untagged_dependency_names = untagged_dependencies.map(&:name)
-		untagged_specs = podfile_specs.select do |spec|
+		untagged_specs = reference_specifications.select do |spec|
 			untagged_dependency_names.include?(spec.name)
 		end
 
 		while untagged_specs.length > 0
 			pods = []
 			untagged_specs.each do |spec|
-				dependency_names = spec.recursive_dependencies(podfile_specs).map { |dep| dep.name }
+				dependency_names = spec.recursive_dependencies(reference_specifications).map { |dep| dep.name }
 				untagged_name = spec.name
 
 				if untagged_specs.select { |spec| dependency_names.include?(spec.name) }.empty?
 					pod = ExternalPodSorter::PodItem.new(untagged_name)
-					pod.spec = podfile_specs.find { |spec| spec.name == untagged_name }	
+					pod.spec = reference_specifications.find { |spec| spec.name == untagged_name }	
 					pod.dependency = untagged_dependencies.find { |dep| dep.name == untagged_name }
 					pod.external_dependency_names = dependency_names.select { |name| untagged_dependency_names.include?(name) }
 					pods << pod
@@ -64,7 +46,6 @@ class ExternalPodSorter
 			untagged_specs = untagged_specs.reject do |spec|
 				pods.select { |pod| pod.name == spec.name }.any?
 			end
-
 			result << pods
 		end
 

data/lib/cocoapods-external-pod-sorter/external_pod_sorter/data_source.rb

@@ -0,0 +1,11 @@
+class ExternalPodSorter
+	class DataSource
+		def untagged_dependencies
+			raise NotImplementedError.new("#{self.class.name}#untagged_dependencies是抽象方法")
+		end
+
+		def reference_specifications
+			raise NotImplementedError.new("#{self.class.name}#reference_specifications是抽象方法")
+		end
+	end
+end

data/lib/cocoapods-external-pod-sorter/external_pod_sorter/data_source/local_data_source.rb

@@ -0,0 +1,30 @@
+require 'cocoapods'
+
+class ExternalPodSorter
+	class LocalDataSource < DataSource
+		def initialize(config = Pod::Config.instance)
+			@config = config
+		end
+
+		def untagged_dependencies
+			@config.podfile.untagged_dependencies
+		end
+
+		def reference_specifications
+			analyzer = Pod::Installer::Analyzer.new(@config.sandbox, @config.podfile, @config.lockfile)			
+			podfile_specs = @config.with_changes(skip_repo_update: true) do 
+				# allow fetch ，初次install时，或者新增external source 时，由于Pods/Local Podspecs 是空，会抛出找不到specification异常
+				begin
+					analyzer.analyze(false).specs_by_target.values.flatten(1)	
+				rescue 
+					analyzer.analyze(true).specs_by_target.values.flatten(1)
+				end
+			end
+
+			podfile_specs
+		rescue
+			puts 'Can`t fetch specs from project directory, fetch from private source cache'.yellow
+			@config.sources_manager.default_source.newest_specs
+		end
+	end
+end

data/lib/cocoapods-external-pod-sorter/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsExternalPodSorter
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-external-pod-sorter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - tripleCC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-25 00:00:00.000000000 Z
+date: 2018-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,8 @@ files:
 - lib/cocoapods-external-pod-sorter/command.rb
 - lib/cocoapods-external-pod-sorter/command/sorter.rb
 - lib/cocoapods-external-pod-sorter/external_pod_sorter.rb
+- lib/cocoapods-external-pod-sorter/external_pod_sorter/data_source.rb
+- lib/cocoapods-external-pod-sorter/external_pod_sorter/data_source/local_data_source.rb
 - lib/cocoapods-external-pod-sorter/external_pod_sorter/pod_item.rb
 - lib/cocoapods-external-pod-sorter/gem_version.rb
 - lib/cocoapods_plugin.rb