pod-target 0.1.2 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 863875f8504bc41d429c6e1c9be0572bb79a85c7c3945670cd61ab006ea067d1
-  data.tar.gz: bd0feae960df1eb8c6ef1b4a2273e0c62b2cee8b60127584167665cf09a55397
+  metadata.gz: 92493f8e310f8b60bbceb4950aa365d473ed6541af360906cfc4b5f4e6fc8953
+  data.tar.gz: 973726e0dace6c66dc32222bcd632bf8f4929def24b3ee0f9bc9ae6abb2e4882
 SHA512:
-  metadata.gz: 8ead07a293e253a6844931ff5c70f13d2faca3439441d9979e328dc4a94a57e9b3b00853b4f1dcb1ab555ef9f4eceecf385e63eaf33b07cf9c728aa05144488d
-  data.tar.gz: 428b84616318dab406334a2480175152a77acfae26d96c80b6a25c328d3fc760a98e0ddae692220ba9ca200b40e21e126fa16f642cb9968388e3ee3c2327a829
+  metadata.gz: e89a1fdbd67cbda451ab92ee4bafff6280e0342d8e0c389132737c049a840ba9b255d250b30ba17464ae1fe571e671617f663683c6a5732a86508e055cf9aa64
+  data.tar.gz: 5fb02e0de8cfaf7a46aff9c5903839c2ef4f9fc9fdead3815ab95fdbd9b10ffe253a41e7e9576978f1ee69ab833e71f694710fe1a088f9a276c551bd6e136963

data/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +1,11 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <Languages>
+        <language minSize="69" name="Ruby" />
+      </Languages>
+    </inspection_tool>
     <inspection_tool class="Rubocop" enabled="false" level="WARNING" enabled_by_default="false" />
   </profile>
 </component>

data/.idea/modules.xml

@@ -2,6 +2,7 @@
 <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/.idea/pod-target.iml

@@ -22,11 +22,13 @@
     <orderEntry type="library" scope="PROVIDED" name="necromancer (v0.3.0, RVM: ruby-2.7.0) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="pastel (v0.6.1, RVM: ruby-2.7.0) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rake (v12.3.3, RVM: ruby-2.7.0) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rexml (v3.2.3, RVM: ruby-2.7.0) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec (v3.10.0, RVM: ruby-2.7.0) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.10.1, RVM: ruby-2.7.0) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.10.1, RVM: ruby-2.7.0) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.10.2, RVM: ruby-2.7.0) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.10.2, RVM: ruby-2.7.0) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby-graphviz (v1.2.5, RVM: ruby-2.7.0) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="thor (v1.1.0, RVM: ruby-2.7.0) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="tty (v0.5.0, RVM: ruby-2.7.0) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="tty-color (v0.3.0, RVM: ruby-2.7.0) [gem]" level="application" />
@@ -45,4 +47,32 @@
     <orderEntry type="library" scope="PROVIDED" name="wisper (v1.6.1, RVM: ruby-2.7.0) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="xcodeproj (v1.19.0, RVM: ruby-2.7.0) [gem]" level="application" />
   </component>
+  <component name="RakeTasksCache">
+    <option name="myRootTask">
+      <RakeTaskImpl id="rake">
+        <subtasks>
+          <RakeTaskImpl description="Build pod-target-0.1.4.gem into the pkg directory" fullCommand="build" id="build" />
+          <RakeTaskImpl description="Remove any temporary products" fullCommand="clean" id="clean" />
+          <RakeTaskImpl description="Remove any generated files" fullCommand="clobber" id="clobber" />
+          <RakeTaskImpl description="Build and install pod-target-0.1.4.gem into system gems" fullCommand="install" id="install" />
+          <RakeTaskImpl id="install">
+            <subtasks>
+              <RakeTaskImpl description="Build and install pod-target-0.1.4.gem into system gems without network access" fullCommand="install:local" id="local" />
+            </subtasks>
+          </RakeTaskImpl>
+          <RakeTaskImpl description="Create tag v0.1.4 and build and push pod-target-0.1.4.gem to rubygems.org" fullCommand="release[remote]" id="release[remote]" />
+          <RakeTaskImpl description="Run RSpec code examples" fullCommand="spec" id="spec" />
+          <RakeTaskImpl description="" fullCommand="default" id="default" />
+          <RakeTaskImpl description="" fullCommand="release" id="release" />
+          <RakeTaskImpl id="release">
+            <subtasks>
+              <RakeTaskImpl description="" fullCommand="release:guard_clean" id="guard_clean" />
+              <RakeTaskImpl description="" fullCommand="release:rubygem_push" id="rubygem_push" />
+              <RakeTaskImpl description="" fullCommand="release:source_control_push" id="source_control_push" />
+            </subtasks>
+          </RakeTaskImpl>
+        </subtasks>
+      </RakeTaskImpl>
+    </option>
+  </component>
 </module>

data/.idea/vcs.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

data/Gemfile

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pod-target (0.1.2)
+    pod-target (0.2.2)
       thor
       xcodeproj (~> 1.7)
 
@@ -20,6 +20,7 @@ GEM
       equatable (~> 0.5.0)
       tty-color (~> 0.3.0)
     rake (12.3.3)
+    rexml (3.2.3)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -33,6 +34,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
+    ruby-graphviz (1.2.5)
+      rexml
     thor (1.1.0)
     tty (0.5.0)
       equatable (~> 0.5.0)
@@ -93,6 +96,7 @@ DEPENDENCIES
   pod-target!
   rake (~> 12.0)
   rspec (~> 3.0)
+  ruby-graphviz
   tty
 
 BUNDLED WITH

data/README.md

@@ -2,6 +2,12 @@
 
 Find dependencies between targets in your pod project, and output the csv file which shows dependencies that can be removed from podspec of the target.
 
+X->Y means X depends on Y
+![Example image](./images/image.png)
+Like the image above, we have: A->B->C and A->C. We will output the file csv named "remove_dependency.csv" to show the targets that can be removed from A. For this example, it will be like this:
+A,C. The first column is the target, and the following targets are targets can be removed.
+
+Moreover, we also draw dependency graph for specific target based on this idea. We remove all dependencies lika A->C, so we can see dependencie between targets clearer.
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -19,9 +25,25 @@ Or install it yourself as:
     $ gem install pod-target
 
 ## Usage
+pod-target resolve-dependency\
+
+Options:\
+      [--workspace=WORKSPACE]  # Set workspace path, if not set will use current directory\
+      \
+      [--output=OUTPUT]        # Set output path of csv file, if not set will use current directory\
+      \
+      [--filter=expression]    # If set, filter targets which name matches the regular expression\
+
+Workspace path and output path can be absolute path or relative path
 
-TODO: Write usage instructions here
+pod-target target\
 
+Options:\
+  [--root=ROOT]            # Set name of the root target, must be set
+  \
+  [--workspace=WORKSPACE]  # Set workspace path, if not set will use current directory
+  \
+  [--output=OUTPUT]        # Set output path of csv file, if not set will use current directory
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/pod/target/cli.rb

@@ -19,20 +19,28 @@ module Pod
       end
       map %w(--version -v) => :version
 
+      desc 'target', 'Find dependencies of the target'
+      method_option :root, type: :string,
+                    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 :output, type: :string,
+                    desc: "Set output path of csv file, if not set will use current directory"
+      def target(*)
+        require_relative 'commands/target'
+        Pod::Target::Commands::Target.new(options).execute
+      end
+
       desc 'resolve-dependency', "Resolve dependencies of pod's targets"
-      method_option :help, aliases: '-h', type: :boolean,
-                           desc: 'Display usage information'
       method_option :workspace, type: :string,
                            desc: "Set workspace path, if not set will use current directory"
       method_option :output, type: :string,
                            desc: "Set output path of csv file, if not set will use current directory"
+      method_option :filter, type: :string, banner: "expression",
+                          desc: "If set, filter targets which name matches the regular expression"
       def resolve_dependency(*)
-        if options[:help]
-          invoke :help, ['resolve-dependency']
-        else
-          require_relative 'commands/resolve/dependency'
-          Pod::Target::Commands::Dependency.new(options).execute
-        end
+        require_relative 'commands/dependency'
+        Pod::Target::Commands::Dependency.new(options).execute
       end
     end
   end

data/lib/pod/target/commands/{resolve/dependency.rb → dependency.rb}

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require_relative '../../command'
+require_relative '../command'
 require 'tty-prompt'
 
 module Pod
   module Target
     module Commands
       class Dependency < Pod::Target::Command
-        require_relative './xcworkspace'
-        require_relative './parser'
-        require_relative './graph'
+        require_relative './resolve/xcworkspace'
+        require_relative './resolve/parser'
+        require_relative './resolve/graph'
         def initialize(options)
           @options = options
         end
@@ -19,13 +19,15 @@ module Pod
             @xcworkspace ||= XCWorkspace.find_workspace
             @output = @options[:output]
             @output ||= '.'
+            @filter = @options[:filter]
+            @filter ||= '.*'
             parse
         end
 
         def parse
           prompt = TTY::Prompt.new
           prompt.ok("Finding targets' dependencies and resolving them...")
-          parser = Parser.new(@xcworkspace)
+          parser = Parser.new(@xcworkspace, @filter)
           targets = parser.all_targets
           graph = Pod::Target::Commands::Graph.new
           graph.add_target_info(targets)
@@ -34,12 +36,11 @@ module Pod
           nodes = graph.nodes
           nodes.each do |_, value|
             level_map = {}
-            graph.bfs(value, level_map, 0)
+            graph.dfs(value, level_map, 0)
             removes = []
             value.neighbors.each do |neighbor|
               if level_map[neighbor.name] > 1
                 removes << neighbor.name
-
               end
             end
             if removes.size > 0

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

@@ -52,7 +52,7 @@ module Pod
                     source.add_neighbor(destination)
                 end
 
-                def bfs(node, level_map, depth)
+                def dfs(node, level_map, depth)
                     return if depth == 3
                     name = node.name                    
                     if level_map.key?(name)
@@ -61,7 +61,19 @@ module Pod
                         level_map[name] = depth
                     end
                     node.neighbors.each do |neighbor|
-                        bfs(neighbor, level_map, depth+1)
+                        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

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

@@ -5,8 +5,8 @@ module Pod
     module Target
         module Commands
             class Parser
-                attr_reader :workspace, :workspace_dir
-                def initialize(workspace_path)
+                attr_reader :workspace, :workspace_dir, :regex
+                def initialize(workspace_path, filter)
                     if workspace_path.nil?
                         prompt = TTY::Prompt.new
                         prompt.error("Error! Cannot find workspace path")
@@ -14,11 +14,12 @@ module Pod
                     end
                     @workspace_dir = File.dirname(workspace_path)
                     @workspace = Xcodeproj::Workspace.new_from_xcworkspace(workspace_path)
+                    @regex = filter
                 end
 
                 def all_targets
                     @projects ||= projects
-                    projects.flat_map(&:targets)
+                    projects.flat_map(&:targets).select { |target| target.name =~ /#{regex}/ }
                 end
 
                 def projects

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

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require_relative '../command'
+require 'tty-prompt'
+require 'graphviz'
+
+module Pod
+  module Target
+    module Commands
+      class Target < Pod::Target::Command
+        require_relative './resolve/xcworkspace'
+        require_relative './resolve/parser'
+        require_relative './resolve/graph'
+        def initialize(options)
+          @options = options
+        end
+
+        def execute(input: $stdin, output: $stdout)
+          @xcworkspace = @options[:workspace]
+          @xcworkspace ||= XCWorkspace.find_workspace
+          @output = @options[:output]
+          @output ||= '.'
+          @root = @options[:root]
+          if @root.nil?
+            prompt = TTY::Prompt.new
+            prompt.error("Root target is not set")
+            exit 1
+          end
+          parse
+        end
+
+        def parse
+          prompt = TTY::Prompt.new
+          prompt.ok("Finding targets' dependencies and build graph...")
+          parser = Parser.new(@xcworkspace, nil)
+          targets = parser.all_targets
+          graph = Graph.new
+          graph.add_target_info(targets)
+          dir = File.dirname(@output + "/dependencies.gv")
+          tmp_file = File.join(dir, '/dependencies.gv')
+          save_gv(graphviz_data(graph), tmp_file)
+          graphviz_graph = GraphViz.parse(tmp_file)
+          file = File.join(dir, '/' + @root + '-dependencies.png')
+          save_png(graphviz_graph, file)
+          FileUtils.remove_file(tmp_file)
+          prompt.ok("File is write at: " + dir + "/" + @root + "-dependencies.png")
+        end
+
+        def save_gv(graphviz_data, filename)
+          graphviz_data.output(dot: filename)
+        end
+
+        def save_png(graphviz_data, filename)
+          graphviz_data.output(png: filename)
+        end
+
+        def graphviz_data(graph)
+          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)
+            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]
+          target_node = graphviz.add_node(node.name)
+          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)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pod/target/templates/target/.gitkeep

@@ -0,0 +1 @@
+#

data/lib/pod/target/version.rb

@@ -1,5 +1,5 @@
 module Pod
   module Target
-    VERSION = "0.1.2"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-target
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.2
 platform: ruby
 authors:
 - Bao Do
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -65,16 +65,19 @@ files:
 - bin/console
 - bin/setup
 - exe/pod-target
+- images/image.png
 - lib/pod/target.rb
 - lib/pod/target/cli.rb
 - lib/pod/target/command.rb
 - lib/pod/target/commands/.gitkeep
-- lib/pod/target/commands/resolve/dependency.rb
+- lib/pod/target/commands/dependency.rb
 - lib/pod/target/commands/resolve/graph.rb
 - lib/pod/target/commands/resolve/parser.rb
 - lib/pod/target/commands/resolve/xcworkspace.rb
+- lib/pod/target/commands/target.rb
 - lib/pod/target/templates/.gitkeep
 - lib/pod/target/templates/resolve/dependency/.gitkeep
+- lib/pod/target/templates/target/.gitkeep
 - lib/pod/target/version.rb
 - pod-target.gemspec
 homepage: https://github.com/bendoppler/podspec-dependency-resolve.git