objc-dependency-tree-generator 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6944120f85c2b779312dfa0b3b08fe591bae9896
-  data.tar.gz: 25a09dfbc4b9ba176f77d9edcf9eb2dd17e92684
+  metadata.gz: 1f25d0837a55076f1417a75d31b2518d3fab24de
+  data.tar.gz: 281ce782fe39c47f2ed422e16e67dff1041213af
 SHA512:
-  metadata.gz: 7d5dc027eac8fb14210c1cec4e470052368418a875ed810a4ee089e978012e41bdb091862cd39eb5eb7af54d21c325581cb0373584134860725d32d07fbfa171
-  data.tar.gz: c8d1330a52bcbbe1701ebcb85edfa917583f668219f8697734425200e7186808cdc75d1199a46f0aea8365bbc9564980db2a7611c0cf4b06af64704c1106342f
+  metadata.gz: 279e924ec194e80d52ac6e9f0e2d1b806e698b2ac0813d38d621df435f31d865e53cf1c04a557f3184479b44e5e2a859d0a66ee6cf25e02553ab58adf9654471
+  data.tar.gz: 7e076f230ea879f53bf6003841723ed9a49c84554d151c5616ee420cad0e692c3165a2ef8bdbca7567113d8324e87e053fd1736f4852412691cfb2e62bf131d5

data/lib/objc_dependency_tree_generator.rb

@@ -13,7 +13,7 @@ class ObjCDependencyTreeGenerator
     @options[:derived_data_project_pattern] = '*-*' unless @options[:derived_data_project_pattern]
 
     @exclusion_prefixes = @options[:exclusion_prefixes] ? @options[:exclusion_prefixes] : 'NS|UI|CA|CG|CI|CF'
-    @object_files_directory = @options[:search_directory]
+    @object_files_directories = @options[:search_directories]
   end
 
   def self.parse_command_line_options
@@ -28,7 +28,7 @@ class ObjCDependencyTreeGenerator
     parser = OptionParser.new do |o|
       o.separator 'General options:'
       o.on('-p PATH', '--path' ,'Path to directory where are your .o files were placed by the compiler', Array) { |directory|
-        options[:search_directory] = Array(options[:search_directory]) | Array(directory)
+        options[:search_directories] = Array(options[:search_directories]) | Array(directory)
       }
       o.on('-D DERIVED_DATA', 'Path to directory where DerivedData is') { |derived_data|
         options[:derived_data_paths] = [derived_data]
@@ -37,8 +37,8 @@ class ObjCDependencyTreeGenerator
       o.on('-s PROJECT_NAME', 'Search project .o files by specified project name') { |project_name|
         options[:project_name] = project_name
       }
-      o.on('-t TARGET_NAME', 'Target of project') { |target_name|
-        options[:target_name] = target_name
+      o.on('-t TARGET_NAME', '--target' 'Target of project', Array) { |target_name|
+        options[:target_names] = Array(options[:target_names]) | Array(target_name)
       }
       o.on('-e PREFIXES', "Prefixes of classes those will be exсluded from visualization. \n\t\t\t\t\tNS|UI\n\t\t\t\t\tUI|CA|MF") { |exclusion_prefixes|
         options[:exclusion_prefixes] = exclusion_prefixes
@@ -69,16 +69,16 @@ class ObjCDependencyTreeGenerator
       return {}
     end
 
-    unless @object_files_directory
-      @object_files_directory =
+    unless @object_files_directories
+      @object_files_directories =
           find_project_output_directory(@options[:derived_data_paths],
                                         @options[:project_name],
                                         @options[:derived_data_project_pattern],
-                                        @options[:target_name])
-      return {} unless @object_files_directory
+                                        @options[:target_names])
+      return {} unless @object_files_directories
     end
 
-    unless @object_files_directory
+    unless @object_files_directories
       puts parser.help
       exit 1
     end
@@ -93,9 +93,9 @@ class ObjCDependencyTreeGenerator
     }
 
     if @options[:swift_dependencies]
-      SwiftDependenciesGenerator.new.generate_dependencies(@object_files_directory, &links_block)
+      SwiftDependenciesGenerator.new.generate_dependencies(@object_files_directories, &links_block)
     else
-      ObjcDependenciesGenerator.new.generate_dependencies(@object_files_directory, @options[:use_dwarf], &links_block)
+      ObjcDependenciesGenerator.new.generate_dependencies(@object_files_directories, @options[:use_dwarf], &links_block)
     end
 
     links

data/lib/objc_dependency_tree_generator_helper.rb

@@ -1,4 +1,4 @@
-def find_project_output_directory(derived_data_paths, project_prefix, project_suffix_pattern, target_name)
+def find_project_output_directory(derived_data_paths, project_prefix, project_suffix_pattern, target_names)
 
   return nil unless derived_data_paths
 
@@ -21,13 +21,25 @@ def find_project_output_directory(derived_data_paths, project_prefix, project_su
 
   filtered_by_target_paths = paths
 
-  if target_name
-    filtered_by_target_paths = paths.find_all { |path| /#{target_name}[^\.]*\.build\/Objects-normal/.match path }
+  if target_names != nil && target_names.length > 0
+    filtered_by_target_paths = paths.find_all { |path| 
+       target_names.any? { |target| /#{target}[^\.]*\.build\/Objects-normal/.match path }
+    }
     $stderr.puts "After target filtration there is #{filtered_by_target_paths.length} directories left"
     if paths.empty?
-      $stderr.puts "Cannot find projects that starts with '#{project_prefix}'' and has target name that starts with '#{target_name}'"
+      $stderr.puts "Cannot find projects that starts with '#{project_prefix}'' and has target name that starts with '#{target_names}'"
       exit 1
     end
+
+    paths_sorted_by_time = filtered_by_target_paths.sort_by { |f| File.ctime(f.chomp) }
+    last_modified_dirs = target_names.map { |target|
+      filtered_by_target = filtered_by_target_paths.find_all { |path| /#{target}[^\.]*\.build\/Objects-normal/.match path }
+      last_modified_dir = filtered_by_target.last.chomp
+      $stderr.puts "Last modifications for #{target} were in\n#{last_modified_dir}\ndirectory at\n#{File.ctime(last_modified_dir)}"
+      last_modified_dir
+    }
+    return last_modified_dirs
+
   end
 
   paths_sorted_by_time = filtered_by_target_paths.sort_by { |f| File.ctime(f.chomp) }
@@ -35,7 +47,7 @@ def find_project_output_directory(derived_data_paths, project_prefix, project_su
   last_modified_dir = paths_sorted_by_time.last.chomp
   $stderr.puts "Last modifications were in\n#{last_modified_dir}\ndirectory at\n#{File.ctime(last_modified_dir)}"
 
-  last_modified_dir
+  [last_modified_dir]
 end
 
 def is_primitive_swift_type?(dest)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: objc-dependency-tree-generator
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Paul Taykalo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies: []
 description: |
   Tool that allows to generate Objective-C and Swift dependency tree from object files