jmpod 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57395f5481cef82d1b55ca91626d91bc8ee89a0b6e081a9d4eb3821eec5f1715
-  data.tar.gz: 35044c8dc835a21abda4c455df1ea58f0bb8ea76f973bc9cebad6cc46413a2c7
+  metadata.gz: 6459c9d7ddb429cda4c2d449c79f80e46151649a2863c6951a7b8e4c6d97dd73
+  data.tar.gz: c41b842e850b3df388afdd81cd63f8a6b37c0258ba0bf5abe79d96749390a8a4
 SHA512:
-  metadata.gz: 5153a66ec8a46e5b4c482c851dbae3ed8fa37400e7b0207a2a1f5a6df6865b072364d11fb24cb53402f6bcd8b46506819366ff66c1384210eb8063d00fbbdbe4
-  data.tar.gz: 80799554d9f43813f1b0bbae3b7aa821c5d4c2184192f9d559f6583bc37db7d177faf583b942171e4512ac33e1873a9280f02da53602ee5daea41cbff4dbf196
+  metadata.gz: 9a4ae079a3999310e502397af86968e9738b2f32fa0e0bf714745b41d4025bac88581a632e5665eaae2bd1a9bd4e8cf4f9e2340b90ad733501bb6737d2c72ec8
+  data.tar.gz: dcf57dbb0dd9ab6ce55ae1b4550b028b9cb222fde327ca7ec9d2f444bcd9928e6145cea0f092b8e11b489ec9250646646be9fc32e47c738da0209dd997985095

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jmpod (0.2.3)
+    jmpod (0.2.5)
       claide (>= 1.0.2, < 2.0)
       cocoapods (>= 1.8.4)
       colored2 (~> 3.1)

data/bin/jmpod

@@ -3,7 +3,6 @@
 require "bundler/setup"
 require "jmpod"
 require "cocoapods"
-require_relative '../lib/cocoapods/analyze'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/jmpod/command/analyze.rb

@@ -3,106 +3,80 @@ require 'pathname'
 require 'tmpdir'
 
 module Jmpod
-  class Command
-    class Analyze < Command
-      self.summary = '分析podfile完整依赖链'
-      self.description =  <<-DESC
-        分析podfile完整依赖链，并输出json文件.
-      DESC
-
-      def initialize(argv)
-        puts 'analyze starting ......'.green
-        @podfile_dir_path = argv.shift_argument
-        super
-      end
+  class Analyze 
+    def podfile_dependencies(podfile)
+      res = []
+      podfile.root_target_definitions.each do |td|
+        children_definitions = td.recursive_children
+        children_definitions.each do |cd|
+          dependencies_hash_array = cd.send(:get_hash_value, 'dependencies')
+          next if dependencies_hash_array.nil? || dependencies_hash_array.count.zero?
 
+          dependencies_hash_array.each do |item|
+            next if item.class.name != 'Hash'
 
-      def podfile_dependencies(podfile)
-        res = []
-        podfile.root_target_definitions.each do |td|
-          children_definitions = td.recursive_children
-          children_definitions.each do |cd|
-            dependencies_hash_array = cd.send(:get_hash_value, 'dependencies')
-            next if dependencies_hash_array.nil? || dependencies_hash_array.count.zero?
-  
-            dependencies_hash_array.each do |item|
-              next if item.class.name != 'Hash'
-  
-              item.each do |name, _|
-                res.push name
-              end
+            item.each do |name, _|
+              res.push name
             end
           end
         end
-        res
       end
+      res
+    end
 
-      def self.options
-        [].concat(super)
+    def analyze_with_podfile(_podfile_dir_path, podfile, lockfile = nil)
+      if _podfile_dir_path
+        sandbox = Dir.mktmpdir
+      else
+        sandbox = Dir.pwd + '/Pods'
       end
+      p 'sandbox === '
+      pp sandbox
+      an = Pod::Installer::Analyzer.new(Pod::Sandbox.new(sandbox), podfile)
+      pp an
+      # analyzer = Pod::Installer::Analyzer.new(
+      #   Pod::Sandbox.new(sandbox),
+      #   podfile,
+      #   lockfile
+      # )
 
-      def validate!
-        super
-      end
+      # specifications = analyzer.analyze.specifications.map(&:root).uniq
 
-      def run
-        puts 'config === '
-        pp config.podfile
-        analyze_with_podfile(nil, config.podfile)
+      # new_map = generate_pods_data(specifications)
+      # p "new_map === "
+      # pp new_map
+      # new_map
+    end
+
+    def generate_pods_data(specs)
+      pods_and_deps_merged = specs.reduce({}) do |result, spec|
+        name = spec.to_s
+        result[name] ||= []
+        result[name].concat(spec.all_dependencies.map(&:to_s))
+        result
       end
-  
-      def analyze_with_podfile(_podfile_dir_path, podfile, lockfile = nil)
-        if _podfile_dir_path
-          sandbox = Dir.mktmpdir
-        else
-          sandbox = Dir.pwd + '/Pods'
-        end
-        p 'sandbox === '
-        pp sandbox
-        analyzer = Pod::Installer::Analyzer.new(
-          Pod::Sandbox.new(sandbox),
-          podfile,
-          lockfile
-        )
-  
-        specifications = analyzer.analyze.specifications.map(&:root).uniq
-  
-        new_map = generate_pods_data(specifications)
-        p "new_map === "
-        pp new_map
-        new_map
+
+      pod_and_deps = pods_and_deps_merged.map do |name, deps|
+        deps.empty? ? name : { name => YAMLHelper.sorted_array(deps.uniq) }
       end
+      YAMLHelper.sorted_array(pod_and_deps)
+    end
 
-      def generate_pods_data(specs)
-        pods_and_deps_merged = specs.reduce({}) do |result, spec|
-          name = spec.to_s
-          result[name] ||= []
-          result[name].concat(spec.all_dependencies.map(&:to_s))
-          result
-        end
+    def self.find_dependencies(name, map, res, dependencies_map, root_name)
+      return unless map[name]
 
-        pod_and_deps = pods_and_deps_merged.map do |name, deps|
-          deps.empty? ? name : { name => YAMLHelper.sorted_array(deps.uniq) }
-        end
-        YAMLHelper.sorted_array(pod_and_deps)
-      end
-  
-      def self.find_dependencies(name, map, res, dependencies_map, root_name)
-        return unless map[name]
-  
-        map[name].each do |k|
-          find_dependencies(k.name, map, res, dependencies_map, root_name)
-          dependency = dependencies_map[k.name.split('/')[0]]
-          res.push dependency.name if dependency && dependency.name != root_name
-        end
-        res
+      map[name].each do |k|
+        find_dependencies(k.name, map, res, dependencies_map, root_name)
+        dependency = dependencies_map[k.name.split('/')[0]]
+        res.push dependency.name if dependency && dependency.name != root_name
       end
-  
-      def self.subspecs_with_name(spec, subspecs_short_names)
-        subspecs_short_names.map do |name|
-          spec.subspecs.find { |ss| ss.name.include? name }
-        end
-      end  
+      res
     end
+
+    def self.subspecs_with_name(spec, subspecs_short_names)
+      subspecs_short_names.map do |name|
+        spec.subspecs.find { |ss| ss.name.include? name }
+      end
+    end  
   end
 end

data/lib/jmpod/command/dependency.rb

@@ -0,0 +1,33 @@
+require 'pp'
+require 'tmpdir'
+require 'jmpod/command/analyze'
+
+module Pod
+  class Command
+    class Dependency < Command
+      self.summary = '分析podfile完整依赖链'
+      self.description =  <<-DESC
+        分析podfile完整依赖链，并输出json文件.
+      DESC
+
+      def initialize(argv)
+        super
+      end
+
+      def self.options
+        [
+        ].concat(super)
+      end
+
+      def validate!
+        super
+        verify_podfile_exists!
+      end
+
+      def run
+        analyze_result = Jmpod::Analyzer.analyze_with_podfile(nil, config.podfile)
+        pp analyze_result
+      end
+    end
+  end
+end

data/lib/jmpod/command.rb

@@ -17,7 +17,7 @@ module Jmpod
     require 'jmpod/command/create'
     require 'jmpod/command/init'
     require 'jmpod/command/config'
-    require 'jmpod/command/analyze'
+    require 'jmpod/command/dependency'
 
     self.abstract_command = true
     self.command = 'jmpod'

data/lib/jmpod/version.rb

@@ -2,5 +2,5 @@ module Jmpod
   # freeze 冻结对象，将对象变成一个常量
   # unless 右边的代码块成立，才会运行左边的代码块
   # defined? 是用来判断本地变量是否存在，也可用来判断是否存在方法
-  VERSION = "0.2.4".freeze unless defined? Jmpod::VERSION
+  VERSION = "0.2.5".freeze unless defined? Jmpod::VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jmpod
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - jieming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-26 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,6 +127,7 @@ files:
 - lib/jmpod/command/create/oc.rb
 - lib/jmpod/command/create/swift.rb
 - lib/jmpod/command/create/third.rb
+- lib/jmpod/command/dependency.rb
 - lib/jmpod/command/init.rb
 - lib/jmpod/command/init/ci.rb
 - lib/jmpod/command/init/unit.rb