api_gen_helper 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f43f43e1bcdf8094ab84ae9847a3543c699bf352
-  data.tar.gz: 40fe845387ca8dda29daa773bf2c35d6f282f89b
+  metadata.gz: a1a829f9a8b59c8fb8cb99d686832bdd4a4a08e4
+  data.tar.gz: 6ddd5ac2534b5e1d4b42cd99e7637e09586371e5
 SHA512:
-  metadata.gz: dee19b7cb9f47e890c0b9a32c57d7f529ca541f17ec6fdcdb5144f1ef6d40a7c7816c6eb07ae2d91c888b3a58ba4caabab58370a8ed8b8d8a7c3d347a8030fce
-  data.tar.gz: 55b6d00d438cdd754b50d5e7f5ffb608f1d1aa44b8b123dfe322bb8b1ea995b3d0ea63cb82000d2a8ab287b49d24b9bc61c8857e09536de1271b3ef4e0b40fee
+  metadata.gz: 49313fb202e9897de18e908f4988f0e5d7eddb453e9199afbd56a7af9fbd7d0ad925c74c2439ac12cb2ca68fd8988896c3ea659ad383c45beb02bd218afda263
+  data.tar.gz: 122670ef0c3744d146d069e3664c958eb61abf2191f80c8054d5e6343af5c2e44b70fdcf5159c124ae06b2611b9cbe523d554bd92cdc27c4d20b8c050818883d

data/lib/api_gen_helper/group_generator.rb

@@ -8,45 +8,30 @@ module ApiGenHelper
 
       def generate_group(project_path, group_path, target_name)
         project = obtain_project(project_path)
-        target_name = target_name
-        group_path = group_path
-        group_name = URI(group_path).path.split('/').last
-
-        group = project[group_path]
-        if !group.nil?
-          remove_build_file_recursivly(group)
-          group.clear
-          group.remove_from_project
-        end
 
-        main_group = create_group_from_directory(project, target_name, group_name, group_path)
+        clear_group(project, [target_name], group_path)
 
-        prepare_main_group(main_group, group_path)
+        group = retrieve_group_or_create_if_needed(group_path, group_path, nil, project, true)
 
-        project.targets.each do |proj_target|
-          if proj_target.name == target_name
-            added_references_recursivly_for_target(proj_target, main_group)
-          end
-        end
-        project.save()
-      end
+        prepare_main_group(group, group_path)
 
-      def remove_build_file_recursivly(group)
-        group.children.each do |child|
-            if child.isa == "PBXFileReference"
-              child.build_files.each do |build_file|
-                build_file.remove_from_project
-              end
-            else
-              remove_build_file_recursivly(child)
-            end
+        project.targets.each do |target|
+           if target.name == target_name
+            added_references_recursivly_for_target(target, group)
+           end
         end
+
+        project.save()
       end
 
       def added_references_recursivly_for_target(target, group)
         group.children.each do |child|
             if child.isa == "PBXFileReference"
-              target.add_file_references([child])
+              if is_bundle_resource?(child.name)
+                target.add_resources([child])
+              elsif is_compile_source?(child.name)
+                target.add_file_references([child])
+              end
             else
               added_references_recursivly_for_target(target, child)
             end
@@ -60,8 +45,8 @@ module ApiGenHelper
         Dir.entries(directory).each do |file_name|
           next if file_name =~ /^\./
           if File.file? File.join(directory, file_name)
-            xcode_file_reference = create_file_reference(group, file_name)
-            group<< xcode_file_reference
+            file_path = File.join(directory, file_name)
+            xcode_file_reference = group.new_reference(file_path)
           end
 
           if File.directory? File.join(directory, file_name)
@@ -72,17 +57,6 @@ module ApiGenHelper
         end
       end
 
-      # Create group for specific target and project
-      # @param project [Xcodeproj::Project] The target xcodeproj file
-      # @param target [Xcodeproj::Project::Object::PBXNativeTarget] The target in xcodeproj file
-      # @param name  [String] String name for group
-      # @param path [String] path for group
-      #
-      # @return [Xcodeproj::Project::Object::PBXGroup]
-      def create_group_from_directory(project, target, name, path)
-        group = project[target].new_group(name, path, :group)
-      end
-
       # Open xcodoproj file
       # @param project_name [String] String path for xcodeproj file
       #
@@ -91,6 +65,188 @@ module ApiGenHelper
         Xcodeproj::Project.open(project_name)
       end
 
+      # Returns an AbstractTarget class for a given name
+      # @param target_name [String] The name of the target
+      # @param project [Xcodeproj::Project] The target xcodeproj file
+      #
+      # @return [Xcodeproj::AbstractTarget]
+      def obtain_target(target_name, project)
+        project.targets.each do |target|
+          return target if target.name == target_name
+        end
+
+        error_description = "Cannot find a target with name #{target_name} in Xcode project"
+        raise StandardError, error_description
+      end
+
+
+      # Adds a provided file to a specific Project and Target
+      # @param project [Xcodeproj::Project] The target xcodeproj file
+      # @param targets_name [String] Array of targets name
+      # @param group_path [Pathname] The Xcode group path for current file
+      # @param dir_path [Pathname] The directory path for current file
+      # @param file_group_path [String] Directory path
+      # @param file_name [String] Current file name
+      # @param file_is_resource [TrueClass or FalseClass] If true then file is resource
+      #
+      # @return [void]
+      def add_file_to_project_and_targets(project, targets_name, group_path, dir_path, file_group_path, file_name, file_is_resource = false)
+        file_path = dir_path
+        file_path = file_path.join(file_group_path) if file_group_path
+        file_path = file_path.join(file_name) if file_name
+
+        module_group = self.retrieve_group_or_create_if_needed(group_path, dir_path, file_group_path, project, true)
+        xcode_file = module_group.new_file(File.absolute_path(file_path))
+
+        targets_name.each do |target|
+          xcode_target = obtain_target(target, project)
+
+          if file_is_resource || self.is_bundle_resource?(file_name)
+            xcode_target.add_resources([xcode_file])
+          elsif self.is_compile_source?(file_name)
+            xcode_target.add_file_references([xcode_file])
+          end
+        end
+      end
+
+
+      # Finds or creates a group in a xcodeproj file with a given path
+      # @param group_path [Pathname] The Xcode group path for module
+      # @param dir_path [Pathname] The directory path for module
+      # @param file_group_path [String] Directory path
+      # @param project [Xcodeproj::Project] The working Xcode project file
+      # @param create_group_if_not_exists [TrueClass or FalseClass] If true nonexistent group will be created
+      #
+      # @return [PBXGroup]
+      def retrieve_group_or_create_if_needed(group_path, dir_path, file_group_path, project, create_group_if_not_exists)
+        group_names = path_names_from_path(group_path)
+        group_components_count = group_names.count
+        group_names += path_names_from_path(file_group_path) if file_group_path
+
+        final_group = project
+
+        group_names.each_with_index do |group_name, index|
+          next_group = final_group[group_name]
+
+          unless next_group
+            return nil unless create_group_if_not_exists
+
+            if group_path != dir_path && index == group_components_count-1
+              next_group = final_group.new_group(group_name, dir_path, :project)
+            else
+              next_group = final_group.new_group(group_name, group_name)
+            end
+          end
+
+          final_group = next_group
+        end
+
+        final_group
+      end
+
+      # Get all files path from group path
+      # @param module_group [PBXGroup] The module group
+      # @param project [Xcodeproj::Project] The target xcodeproj file
+      #
+      # @return [[String]]
+      def files_path_from_group(module_group, _project)
+        files_path = []
+
+        module_group.recursive_children.each do |file_ref|
+          if file_ref.isa == 'PBXFileReference'
+            file_ref_path = configure_file_ref_path(file_ref)
+            files_path.push(file_ref_path)
+          end
+        end
+
+        files_path
+      end
+
+      def clear_group(project, targets_name, group_path)
+        module_group = retrieve_group_or_create_if_needed(group_path, nil, nil, project, false)
+        return unless module_group
+
+        files_path = files_path_from_group(module_group, project)
+        return unless files_path
+
+        files_path.each do |file_path|
+          remove_file_by_file_path(file_path, targets_name, project)
+        end
+
+        module_group.clear
+      end
+
+      # Remove build file from target build phase
+      # @param file_path [String] The path of the file
+      # @param targets_name [String] Array of targets
+      # @param project [Xcodeproj::Project] The target xcodeproj file
+      #
+      # @return [Void]
+      def remove_file_by_file_path(file_path, targets_name, project)
+        file_names = path_names_from_path(file_path)
+
+        build_phases = nil
+
+        if is_compile_source?(file_names.last)
+          build_phases = build_phases_from_targets(targets_name, project)
+        elsif is_bundle_resource?(file_names.last)
+          build_phases = resources_build_phase_from_targets(targets_name, project)
+        end
+
+        remove_file_from_build_phases(file_path, build_phases)
+      end
+
+      def remove_file_from_build_phases(file_path, build_phases)
+            return if build_phases.nil?
+
+            build_phases.each do |build_phase|
+              build_phase.files.each do |build_file|
+                next if build_file.nil? || build_file.file_ref.nil?
+
+                build_file_path = configure_file_ref_path(build_file.file_ref)
+
+                if build_file_path == file_path
+                  build_phase.remove_build_file(build_file)
+                end
+              end
+            end
+      end
+
+      # Find and return target build phases
+      # @param targets_name [String] Array of targets
+      # @param project [Xcodeproj::Project] The target xcodeproj file
+      #
+      # @return [[PBXSourcesBuildPhase]]
+      def build_phases_from_targets(targets_name, project)
+        build_phases = []
+
+        targets_name.each do |target_name|
+          xcode_target = obtain_target(target_name, project)
+          xcode_target.build_phases.each do |build_phase|
+            if build_phase.isa == 'PBXSourcesBuildPhase'
+              build_phases.push(build_phase)
+            end
+          end
+        end
+
+        build_phases
+      end
+
+      # Get configure file full path
+      # @param file_ref [PBXFileReference] Build file
+      #
+      # @return [String]
+      def configure_file_ref_path(file_ref)
+        build_file_ref_path = file_ref.hierarchy_path.to_s
+        build_file_ref_path[0] = ''
+
+        build_file_ref_path
+      end
+
+      def path_names_from_path(path)
+        path.to_s.split('/')
+      end
+
       #Create file reference for specific group
       # @param group [Xcodeproj::Project::Object::PBXGroup] - group where create file reference
       # @param path [String] path for file

data/lib/api_gen_helper/version.rb

@@ -1,3 +1,3 @@
 module ApiGenHelper
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_gen_helper
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Nikolay Aksenov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj