cocoapods-hipac 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f269935ce593da1dafc4fafb74856901770cc26
-  data.tar.gz: 992de1c2dfac9159693762eefc388dfdf803693c
+  metadata.gz: 3dc8a84d1a80fd4659c28c7b0653fed9cca0493e
+  data.tar.gz: 971cb916671c86020e0d31ae1dac97bc2188d341
 SHA512:
-  metadata.gz: d4eb0ae2586846ffd812003734c1fe13223c9fafdd9b0b7122a5ab594e6d6b6e7325e5687af638ba3be0efa749b8e3e81fbde9d0c0db69df3b7db0b5d42da2c0
-  data.tar.gz: 500dc66f069554caa5ff15d47ecee418787ab124bbfc56e16a8bace75c45f87611b3f4ff10108e410d80cde5d2a7c6a3d20d539fd4a514d0edafa7fa9d82e0b9
+  metadata.gz: 265c8333d5f688daf69575aef7ee5ccca8db10def324ae4990cf33d71b005a60875980bf96145a067c9ea4ae9752ef2fd7a99c0962938b36f87655f53fd903bf
+  data.tar.gz: 5464b26a0057bd4ae3d51b0b9cd05991a93f1a4221710a161b15ae94fbf478b50e256e2f24b92bf8de67ce3fbd67fd309ddb59baea9db996f1b88edb2915a261

data/README.md

@@ -1,4 +1,11 @@
-hipac cocoapods-plugin
+# hipac cocoapods-plugin
 为 pod 提供二级命令 hipac
+## install
+`gem install cocoapods-hipac`
 ## usage
-`pod hipac sort` 根据 podFile 分析依赖
+* `pod hipac depsort` 根据 podFile 分析依赖
+* `pod hipac pull`    根据 podFile 将开发状态 pod 批量更新至本地  
+  所有 pod 会 pull 至 podFile 所在目录的上一级  
+  本地没有该 pod 仓库 执行git clone -b  
+  本地有该 pod 仓库，且分支一致，执行 git stash & git pull  
+  本地有该 pod 仓库，但分支不一致，执行 git stash & git checkout branch & git pull

data/lib/cocoapods-hipac/command/cocoapods/podfile.rb

@@ -15,5 +15,15 @@ module Pod
 			dev_dependency_list
 
 		end
+
+		def all_dependency_list
+			main_target_definition_list = target_definition_list.reject do |target_definition|
+				target_definition.name.end_with?('Tests') || target_definition.name.end_with?('Widget')
+			end
+
+			all_dependency_list = main_target_definition_list.flat_map(&:dependencies).uniq
+
+			all_dependency_list
+		end
 	end
 end

data/lib/cocoapods-hipac/command/cocoapods/specification.rb

@@ -10,11 +10,17 @@ module Pod
 			end
 
 			def direct_dependencies
-				@direct_dependencies ||= begin 
+				@direct_dependencies ||= begin
 					direct_value('dependencies')
 				end
 			end
 
+
+
+			def recursive_tree(specs)
+				resolve_recursive_tree(specs)
+			end
+
 			protected
 			def direct_value(name, platform = :ios)
 				subspec_consumers = recursive_subspecs.select { |s| s.supported_on_platform?(platform) }
@@ -26,14 +32,28 @@ module Pod
 
 			def resolve_recursive_dependencies(specs)
 				direct_dependencies.map do |dep|
-					spec = specs.find { |s| s.name == dep.name }
+					spec = specs.find { |s| s.name.eql?(dep.name) }
 					next dep if spec.nil? || spec.direct_dependencies.empty?
-						
+
 					(Array(dep) + spec.resolve_recursive_dependencies(specs)).flatten
+
 				end.compact.flatten.uniq
 			end
+
+			def resolve_recursive_tree(specs, line='-')
+				direct_dependencies.each do |dep|
+					spec = specs.find { |s| s.name.eql?(dep.name)}
+					next dep if spec.nil?
+					UI.puts line + ' ' + spec.name
+
+					if !spec.direct_dependencies.empty?
+						spec.resolve_recursive_tree(specs, '-'+line)
+					end
+
+				end
+			end
 		end
 
 		include Pod::Specification::RecursiveDependency
 	end
-end
+end

data/lib/cocoapods-hipac/command/cocoapods/tool.rb

@@ -0,0 +1,18 @@
+require 'cocoapods'
+
+def reference_spec_list
+  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.last_specs
+end

data/lib/cocoapods-hipac/command/depsort.rb

@@ -1,7 +1,8 @@
 require 'cocoapods-hipac/command/cocoapods/podfile'
 require 'cocoapods-hipac/command/cocoapods/source'
 require 'cocoapods-hipac/command/cocoapods/specification'
-require 'cocoapods-hipac/command/depsort/pod_item'
+require 'cocoapods-hipac/command/cocoapods/pod_item'
+require 'cocoapods-hipac/command/cocoapods/tool'
 
 
 module Pod
@@ -11,11 +12,18 @@ module Pod
         self.summary = '根据 Podfile 文件对 pod 依赖分析'
 
         self.description = <<-DESC
-          根据 Podfile 文件对 pod 依赖分析
+          根据 Podfile 文件对 pod 依赖分析，默认只对处于开发状态的 pod 排序
         DESC
 
+        def self.options
+          [
+            ['--all', '所有依赖'],
+          ].concat(Pod::Command::Lib::Lint.options).concat(super).uniq
+        end
+
         def initialize(argv)
           @config = Pod::Config.instance
+          @all = argv.flag?('all')
           help! 'No `Podfile` found in the project directory.' if Pathname.glob('Podfile').empty?
           super
         end
@@ -27,7 +35,7 @@ module Pod
         def run
           UI.puts "pod hipac depsort"
 
-          group_pods_dep(dev_dependency_list(), reference_spec_list())
+          group_pods_dep(dependency_list(), reference_spec_list())
 
           if @grouped_pods
 
@@ -56,25 +64,16 @@ module Pod
           end
         end
 
-        def dev_dependency_list
-    			@config.podfile.dev_dependency_list
-    		end
+        def dependency_list
+          list = []
+
+          if @all
+            list = @config.podfile.all_dependency_list
+          else
+            list = @config.podfile.dev_dependency_list
+          end
 
-        def reference_spec_list
-    			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.last_specs
+          list
     		end
 
         def group_pods_dep(dev_dependency_list, reference_spec_list)

data/lib/cocoapods-hipac/command/hipac.rb

@@ -1,5 +1,6 @@
 require 'cocoapods-hipac/command/depsort'
 require 'cocoapods-hipac/command/pull'
+require 'cocoapods-hipac/command/tree'
 
 
 module Pod

data/lib/cocoapods-hipac/command/tree.rb

@@ -0,0 +1,55 @@
+require 'cocoapods-hipac/command/cocoapods/podfile'
+require 'cocoapods-hipac/command/cocoapods/source'
+require 'cocoapods-hipac/command/cocoapods/specification'
+require 'cocoapods-hipac/command/cocoapods/pod_item'
+require 'cocoapods-hipac/command/cocoapods/tool'
+
+
+module Pod
+  class Command
+    class Hipac < Command
+      class Tree < Hipac
+        self.summary = '根据 Podfile 文件对 pod 依赖分析'
+
+        self.description = <<-DESC
+          根据 Podfile 文件对 pod 依赖分析
+        DESC
+
+        def initialize(argv)
+          @config = Pod::Config.instance
+          help! 'No `Podfile` found in the project directory.' if Pathname.glob('Podfile').empty?
+          super
+        end
+
+        def validate!
+          super
+        end
+
+        def run
+          all_dependency_name_list = all_dependency_list().map(&:name)
+
+          all_spec_list = reference_spec_list()
+
+          private_dependency_list = all_spec_list.select do |spec|
+      			all_dependency_name_list.include?(spec.name)
+      		end
+
+          UI.puts 'tree start'
+    			private_dependency_list.each do |spec|
+              UI.puts spec.name
+      				spec.recursive_tree(all_spec_list)
+              UI.puts "\n"
+    			end
+          UI.puts 'tree end'
+
+        end
+
+        def all_dependency_list
+    			@config.podfile.all_dependency_list
+    		end
+
+
+      end
+    end
+  end
+end

data/lib/cocoapods-hipac/gem_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-hipac
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - QiYa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-01 00:00:00.000000000 Z
+date: 2019-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,13 +53,15 @@ files:
 - cocoapods-hipac.gemspec
 - lib/cocoapods-hipac.rb
 - lib/cocoapods-hipac/command.rb
+- lib/cocoapods-hipac/command/cocoapods/pod_item.rb
 - lib/cocoapods-hipac/command/cocoapods/podfile.rb
 - lib/cocoapods-hipac/command/cocoapods/source.rb
 - lib/cocoapods-hipac/command/cocoapods/specification.rb
+- lib/cocoapods-hipac/command/cocoapods/tool.rb
 - lib/cocoapods-hipac/command/depsort.rb
-- lib/cocoapods-hipac/command/depsort/pod_item.rb
 - lib/cocoapods-hipac/command/hipac.rb
 - lib/cocoapods-hipac/command/pull.rb
+- lib/cocoapods-hipac/command/tree.rb
 - lib/cocoapods-hipac/gem_version.rb
 - lib/cocoapods_plugin.rb
 - spec/command/hipac_spec.rb