cocoapods-hipac 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dc8a84d1a80fd4659c28c7b0653fed9cca0493e
-  data.tar.gz: 971cb916671c86020e0d31ae1dac97bc2188d341
+  metadata.gz: 1fb11a7cb6a2d71811d6e26bb4ddfb914c5559d7
+  data.tar.gz: e33e7a586ebf129566178a90e55e0be48f4b980f
 SHA512:
-  metadata.gz: 265c8333d5f688daf69575aef7ee5ccca8db10def324ae4990cf33d71b005a60875980bf96145a067c9ea4ae9752ef2fd7a99c0962938b36f87655f53fd903bf
-  data.tar.gz: 5464b26a0057bd4ae3d51b0b9cd05991a93f1a4221710a161b15ae94fbf478b50e256e2f24b92bf8de67ce3fbd67fd309ddb59baea9db996f1b88edb2915a261
+  metadata.gz: f8adc7b7c13cd6a56e139242896f3be08507a6d27e8aeeeaf31abf0cca8726ef6f690e2d1078f4f342bbbdccc40d3e2f0341f3104cdbee56cc907687bdcb3fe7
+  data.tar.gz: 16180fdea911ef55f2a0dcf810fe7a54cc31b550e2b9d1b6250f99264e0abbefd60505360ddf4452eb815a6fb9f52e1d6074e85cf465e3245d915b22d337f593

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

@@ -13,7 +13,7 @@ module Pod
 		end
 
 		class Manager
-			HIPAC_SOURCE_URL = 'git@git.hipac.cn:Wireless/iOS/HipacSpecs.git'.freeze
+			HIPAC_SOURCE_URL = 'git@ytgit.hipac.cn:Wireless/iOS/HipacSpecs.git'.freeze
 
 			def last_specs_with_source_name_or_url(name_or_url)
 				source = source_with_name_or_url(name_or_url)

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

@@ -1,4 +1,6 @@
 require 'cocoapods'
+require 'cocoapods-hipac/command/cocoapods/pod_item'
+
 
 def reference_spec_list
   analyzer = Pod::Installer::Analyzer.new(@config.sandbox, @config.podfile, @config.lockfile)
@@ -16,3 +18,37 @@ def reference_spec_list
   puts 'Can`t fetch specs from project directory, fetch from private source cache'.yellow
   @config.sources_manager.default_source.last_specs
 end
+
+
+def group_pods_dep(dev_dependency_list, reference_spec_list)
+	grouped_pods = []
+
+	dev_dependency_name_list = dev_dependency_list.map(&:name)
+
+	dev_specs = reference_spec_list.select do |spec|
+		dev_dependency_name_list.include?(spec.name)
+	end
+
+	while dev_specs.length > 0
+		pods = []
+		dev_specs.each do |spec|
+			dependency_names = spec.recursive_dependencies(reference_spec_list).map { |dep| dep.name }
+			dev_name = spec.name
+
+			if dev_specs.select { |spec| dependency_names.include?(spec.name) }.empty?
+				pod = PodItem.new(dev_name)
+				pod.spec = reference_spec_list.find { |spec| spec.name == dev_name }
+				pod.dependency = dev_dependency_list.find { |dep| dep.name == dev_name }
+				pod.external_dependency_names = dependency_names.select { |name| dev_dependency_name_list.include?(name) }
+				pods << pod
+			end
+		end
+		dev_specs = dev_specs.reject do |spec|
+			pods.select { |pod| pod.name == spec.name }.any?
+		end
+		grouped_pods << pods
+	end
+
+  grouped_pods
+
+end

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

@@ -0,0 +1,78 @@
+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 Deplist < Hipac
+        self.summary = '列出 pod 的所有依赖'
+
+        self.description = <<-DESC
+          根据 Podfile 文件对 pod 依赖分析，列出 pod 的所有依赖
+        DESC
+
+        def self.options
+          [
+            ['--json', '将依赖以 json 格式输出']
+          ].concat(Pod::Command::Lib::Lint.options).concat(super).uniq
+        end
+
+        def initialize(argv)
+          @config = Pod::Config.instance
+          @json = argv.flag?('json')
+          help! 'No `Podfile` found in the project directory.' if Pathname.glob('Podfile').empty?
+          super
+        end
+
+        def validate!
+          super
+        end
+
+        def run
+          UI.puts "pod hipac deplist"
+
+          @grouped_pods = group_pods_dep(dependency_list(), reference_spec_list())
+
+          if @grouped_pods
+            json_pod = {}
+            str_pod = ""
+            @grouped_pods.each do |group|
+              group.each do |pod|
+                str_pod << pod.name.dup
+                dep_pods = []
+                if pod.external_dependency_names.any?
+                  pod.external_dependency_names.each do |name|
+                    str_pod << "\n- #{name}"
+                    dep_pods << name
+                  end
+                end
+                str_pod << "\n\n"
+                json_pod[pod.name.dup] = dep_pods
+              end
+            end
+
+            if @json
+              puts json_pod.to_json
+            else
+              puts str_pod
+            end
+          end
+        end
+
+        def dependency_list
+          list = []
+
+          list = @config.podfile.all_dependency_list
+
+          list
+    		end
+
+      end
+
+    end
+  end
+end

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

@@ -18,12 +18,14 @@ module Pod
         def self.options
           [
             ['--all', '所有依赖'],
+            ['--json', '将依赖以 json 格式输出']
           ].concat(Pod::Command::Lib::Lint.options).concat(super).uniq
         end
 
         def initialize(argv)
           @config = Pod::Config.instance
           @all = argv.flag?('all')
+          @json = argv.flag?('json')
           help! 'No `Podfile` found in the project directory.' if Pathname.glob('Podfile').empty?
           super
         end
@@ -35,21 +37,13 @@ module Pod
         def run
           UI.puts "pod hipac depsort"
 
-          group_pods_dep(dependency_list(), reference_spec_list())
+          @grouped_pods = group_pods_dep(dependency_list(), reference_spec_list())
 
           if @grouped_pods
-
             sort_pods = []
             @grouped_pods.each do |group|
               group.each do |pod|
-                display = pod.name.dup
-                if pod.external_dependency_names.any?
-                  pod.external_dependency_names.each do |name|
-                    display << "\n- #{name}"
-                  end
-                end
-                display << "\n\n"
-                puts display
+
                 sort_pods << pod
               end
             end
@@ -58,6 +52,7 @@ module Pod
               pod.external_dependency_names.length
             end
 
+            UI.puts "\n\npod_dep_sort_result\n\n"
             UI.puts sort_pods
           else
             puts '没有未依赖正式版本组件.'
@@ -76,40 +71,6 @@ module Pod
           list
     		end
 
-        def group_pods_dep(dev_dependency_list, reference_spec_list)
-      		result = []
-
-      		dev_dependency_name_list = dev_dependency_list.map(&:name)
-
-      		dev_specs = reference_spec_list.select do |spec|
-      			dev_dependency_name_list.include?(spec.name)
-      		end
-
-      		while dev_specs.length > 0
-      			pods = []
-      			dev_specs.each do |spec|
-      				dependency_names = spec.recursive_dependencies(reference_spec_list).map { |dep| dep.name }
-      				dev_name = spec.name
-
-      				if dev_specs.select { |spec| dependency_names.include?(spec.name) }.empty?
-      					pod = PodItem.new(dev_name)
-      					pod.spec = reference_spec_list.find { |spec| spec.name == dev_name }
-      					pod.dependency = dev_dependency_list.find { |dep| dep.name == dev_name }
-      					pod.external_dependency_names = dependency_names.select { |name| dev_dependency_name_list.include?(name) }
-      					pods << pod
-      				end
-      			end
-      			dev_specs = dev_specs.reject do |spec|
-      				pods.select { |pod| pod.name == spec.name }.any?
-      			end
-      			result << pods
-      		end
-
-          @grouped_pods = result
-      		@grouped_pods
-
-      	end
-
       end
 
     end

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

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

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

@@ -15,8 +15,16 @@ module Pod
           根据 Podfile 文件对 pod 依赖分析
         DESC
 
+        def self.options
+          [
+            ['--own', '指定podfile中录入的库'],
+          ].concat(Pod::Command::Lib::Lint.options).concat(super).uniq
+        end
+
         def initialize(argv)
           @config = Pod::Config.instance
+          @own = argv.flag?('own')
+
           help! 'No `Podfile` found in the project directory.' if Pathname.glob('Podfile').empty?
           super
         end
@@ -29,6 +37,11 @@ module Pod
           all_dependency_name_list = all_dependency_list().map(&:name)
 
           all_spec_list = reference_spec_list()
+          if @own
+            all_spec_list = reference_spec_list().select { |spec|
+              all_dependency_name_list.include?(spec.name)
+            }
+          end
 
           private_dependency_list = all_spec_list.select do |spec|
       			all_dependency_name_list.include?(spec.name)

data/lib/cocoapods-hipac/gem_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-hipac
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - QiYa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,12 +45,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- Gemfile
-- LICENSE.txt
-- README.md
-- Rakefile
-- cocoapods-hipac.gemspec
 - lib/cocoapods-hipac.rb
 - lib/cocoapods-hipac/command.rb
 - lib/cocoapods-hipac/command/cocoapods/pod_item.rb
@@ -58,14 +52,13 @@ files:
 - 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/deplist.rb
 - lib/cocoapods-hipac/command/depsort.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
-- spec/spec_helper.rb
 homepage: https://github.com/EXAMPLE/cocoapods-hipac
 licenses:
 - MIT
@@ -90,6 +83,4 @@ rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A longer description of cocoapods-hipac.
-test_files:
-- spec/command/hipac_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.gitignore

@@ -1,3 +0,0 @@
-.DS_Store
-pkg
-.idea/

data/Gemfile

@@ -1,13 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in cocoapods-hipac.gemspec
-gemspec
-
-group :development do
-  gem 'cocoapods'
-
-  gem 'mocha'
-  gem 'bacon'
-  gem 'mocha-on-bacon'
-  gem 'prettybacon'
-end

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2019 Demo <DEMO@JL.Local>
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,11 +0,0 @@
-# hipac cocoapods-plugin
-为 pod 提供二级命令 hipac
-## install
-`gem install cocoapods-hipac`
-## usage
-* `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/Rakefile

@@ -1,13 +0,0 @@
-require 'bundler/gem_tasks'
-
-def specs(dir)
-  FileList["spec/#{dir}/*_spec.rb"].shuffle.join(' ')
-end
-
-desc 'Runs all the specs'
-task :specs do
-  sh "bundle exec bacon #{specs('**')}"
-end
-
-task :default => :specs
-

data/cocoapods-hipac.gemspec

@@ -1,24 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'cocoapods-hipac/gem_version.rb'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'cocoapods-hipac'
-  spec.version       = CocoapodsHipac::VERSION
-  spec.authors       = ['QiYa']
-  spec.email         = ['jl.0130@hotmail.com']
-  spec.description   = %q{A short description of cocoapods-hipac.}
-  spec.summary       = %q{A longer description of cocoapods-hipac.}
-  spec.homepage      = 'https://github.com/EXAMPLE/cocoapods-hipac'
-  spec.license       = 'MIT'
-
-  # spec.files         = Dir['lib/**/*']
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
-
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
-end

data/spec/command/hipac_spec.rb

@@ -1,12 +0,0 @@
-require File.expand_path('../../spec_helper', __FILE__)
-
-module Pod
-  describe Command::Hipac do
-    describe 'CLAide' do
-      it 'registers it self' do
-        Command.parse(%w{ hipac }).should.be.instance_of Command::Hipac
-      end
-    end
-  end
-end
-

data/spec/spec_helper.rb

@@ -1,50 +0,0 @@
-require 'pathname'
-ROOT = Pathname.new(File.expand_path('../../', __FILE__))
-$:.unshift((ROOT + 'lib').to_s)
-$:.unshift((ROOT + 'spec').to_s)
-
-require 'bundler/setup'
-require 'bacon'
-require 'mocha-on-bacon'
-require 'pretty_bacon'
-require 'pathname'
-require 'cocoapods'
-
-Mocha::Configuration.prevent(:stubbing_non_existent_method)
-
-require 'cocoapods_plugin'
-
-#-----------------------------------------------------------------------------#
-
-module Pod
-
-  # Disable the wrapping so the output is deterministic in the tests.
-  #
-  UI.disable_wrap = true
-
-  # Redirects the messages to an internal store.
-  #
-  module UI
-    @output = ''
-    @warnings = ''
-
-    class << self
-      attr_accessor :output
-      attr_accessor :warnings
-
-      def puts(message = '')
-        @output << "#{message}\n"
-      end
-
-      def warn(message = '', actions = [])
-        @warnings << "#{message}\n"
-      end
-
-      def print(message)
-        @output << message
-      end
-    end
-  end
-end
-
-#-----------------------------------------------------------------------------#