pod-target 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c295b45538525799e71dfab6879e9919289ffcd5dc92a36004ea9d0f1e809c7
-  data.tar.gz: d470fd27f32dce46cf517de02bca2c2b1d9a4f4bf9c7eb823352dddf22051641
+  metadata.gz: 9c07fda75a108a3e43385e3a814087608b79e5e132a76f2095846c820d1c08be
+  data.tar.gz: 4d7b525d33f96c4c88afefa61af691be7afd145664c077ab10d4fccd6b7ed579
 SHA512:
-  metadata.gz: 7db41989940fc351f282ab6d154e0dbfac5cb914715fdb29f03cedb0841f46f0ba24b74fbebc5a27c1860294345758df87d69d0480b786a3317a2a659a160e15
-  data.tar.gz: a8a6be9427993f40fd5c5548c08e554ad9b958a3fd5f5a9619b569d8cb4e61f27a052530d56516947769a4ee9fc276e718862418e35cc331d157bd3d74afb291
+  metadata.gz: 4cc1b3ae11563e15ea370e594d18987c2ff8ef166322bbbf18e70fcd88723d45511c6349e98251198f726c77b382ac0306442facc59230184e31adc45a76844f
+  data.tar.gz: f6f6535f397e1b34dba9d0ee9e046cf7abf62aeb3d877145a791f3b2c5c986e88d8b9f1b5e04fa91bfc6547a4847af1ac88f4c67c46aaf42fb05fb34825ea7d8

data/.idea/modules.xml

@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$USER_HOME$/Learning/pandan/.idea/pandan.iml" filepath="$USER_HOME$/Learning/pandan/.idea/pandan.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/pod-target.iml" filepath="$PROJECT_DIR$/.idea/pod-target.iml" />
     </modules>
   </component>

data/Gemfile

@@ -6,4 +6,5 @@ gemspec
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
 gem 'tty'
-gem 'ruby-graphviz'
+gem 'ruby-graphviz'
+gem 'tty-prompt'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pod-target (0.2.0)
+    pod-target (0.3.0)
       thor
       xcodeproj (~> 1.7)
 
@@ -98,6 +98,7 @@ DEPENDENCIES
   rspec (~> 3.0)
   ruby-graphviz
   tty
+  tty-prompt
 
 BUNDLED WITH
-   2.1.2
+   2.1.4

data/lib/pod/target/cli.rb

@@ -24,6 +24,8 @@ module Pod
                     desc: 'Set name of the root target, must be set'
       method_option :workspace, type: :string,
                     desc: "Set workspace path, if not set will use current directory"
+      method_option :max_depth, type: :numeric,
+                    desc: "Set max depth of the graph, if not set will traverse the whole graph"
       method_option :output, type: :string,
                     desc: "Set output path of csv file, if not set will use current directory"
       def target(*)

data/lib/pod/target/commands/resolve/graph.rb

@@ -64,18 +64,6 @@ module Pod
                         dfs(neighbor, level_map, depth+1)
                     end
                 end
-
-                def dfs2(node, level_map, depth)
-                    name = node.name
-                    if level_map.key?(name)
-                        level_map[name] = [level_map[name], depth].max
-                    else
-                        level_map[name] = depth
-                    end
-                    node.neighbors.each do |neighbor|
-                        dfs2(neighbor, level_map, depth+1)
-                    end
-                end
             end
         end
     end

data/lib/pod/target/commands/target.rb

@@ -21,6 +21,8 @@ module Pod
           @output = @options[:output]
           @output ||= '.'
           @root = @options[:root]
+          @max_depth = @options[:max_depth]
+          @max_depth ||= -1
           if @root.nil?
             prompt = TTY::Prompt.new
             prompt.error("Root target is not set")
@@ -40,9 +42,10 @@ module Pod
           tmp_file = File.join(dir, '/dependencies.gv')
           save_gv(graphviz_data(graph), tmp_file)
           graphviz_graph = GraphViz.parse(tmp_file)
-          save_png(graphviz_graph, 'dependencies.png')
+          file = File.join(dir, '/' + @root + '-dependencies.png')
+          save_png(graphviz_graph, file)
           FileUtils.remove_file(tmp_file)
-          prompt.ok("File is write at: " + dir + "/dependencies.png")
+          prompt.ok("File is write at: " + dir + "/" + @root + "-dependencies.png")
         end
 
         def save_gv(graphviz_data, filename)
@@ -54,27 +57,37 @@ module Pod
         end
 
         def graphviz_data(graph)
-          node = graph.nodes.values.find { |node| node.name =~ /#{@root}/ }
-          unless  node.nil?
+          node = graph.nodes.values.find { |node| node.name == @root }
+          if node.nil?
+            prompt = TTY::Prompt.new
+            prompt.error("Cannot find root target")
+            exit 1
+          else
             graphviz = GraphViz.new(type: :digraph)
-            level_map = {}
-            graph.dfs2(node, level_map, 0)
-            visited = Set.new([])
-            dfs(graphviz, node, visited, level_map)
+            parent = {}
+            dfs(graphviz, node, graph, parent, 0)
             graphviz
           end
         end
 
-        def dfs(graphviz, node, visited, level_map)
-          return if visited.include?(node.name)
-          visited.add(node.name)
-          depth = level_map[node.name]
+        def dfs(graphviz, node, graph, parent, depth)
+          if @max_depth != -1 && depth == @max_depth
+            return
+          end
           target_node = graphviz.add_node(node.name)
+          level_map = {}
+          graph.dfs(node, level_map, 0)
           node.neighbors.each do |dependency|
-            if level_map[dependency.name] == depth+1
-              dep_node = graphviz.add_node(dependency.name)
-              graphviz.add_edge(target_node, dep_node)
-              dfs(graphviz, dependency, visited, level_map)
+            if level_map[dependency.name] == 1
+              if parent.key?(dependency.name) == false
+                parent[dependency.name] = Set.new
+              end
+              if parent[dependency.name].include?(node.name) == false
+                parent[dependency.name].add(node.name)
+                dep_node = graphviz.add_node(dependency.name)
+                graphviz.add_edge(target_node, dep_node)
+                dfs(graphviz, dependency, graph, parent, depth+1)
+              end
             end
           end
         end

data/lib/pod/target/version.rb

@@ -1,5 +1,5 @@
 module Pod
   module Target
-    VERSION = "0.2.0"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-target
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Bao Do
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-16 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: '"Retrive targets'' dependencies and optimize them"'