xcodeproj 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6468f6b75aff22cc08a717290a382693e8125588
-  data.tar.gz: 3dbb139858843463ea7fb130da5d3d06477339c4
+  metadata.gz: 4cf7c67e37553582eac9e119e155558e65ce2438
+  data.tar.gz: dd844950bbe7c28793d938ac2a9926d8721b8755
 SHA512:
-  metadata.gz: 91a24f65192034d96f77e24d9e6eff7295c7ec25b6bcaf7914ad4ea430ac6ab0cbb236d6eeacf0eea0a4e04941f06dfe5cb33988e1e89fee1fe9004095941599
-  data.tar.gz: b1c8ba00d8a772a4d3db04dd3d3a20ce9536a8013650397fe6301e1e3917a8c4e5b6c057f9633017c3db04ee8b68452fea69eabf79c30e12a71ec9d76c65dbe8
+  metadata.gz: 79704df4aaa923f2b2938e9291b3acade4b46d60e15c7919626460c697cd814d3b8916860fbfed96338998a6ca94299874aee91a46ebd096506af8acf050d13a
+  data.tar.gz: 2ec745a65f34fdf8a3c103fb75ecc318c0746619e9a545bf05fe6eef4c0d2b1a7bbf836f085aa9f1ec4179397cb17cb4626ed3c4d5cdc12397e2d62ea7dab4a9

data/ext/xcodeproj/xcodeproj_ext.c

@@ -256,10 +256,12 @@ write_plist(VALUE self, VALUE hash, VALUE path) {
     if (!success) {
       CFShow(errorString);
     }
+    CFWriteStreamClose(stream);
   } else {
     printf("Unable to open stream!\n");
   }
 
+  CFRelease(stream);
   CFRelease(dict);
   return success ? Qtrue : Qfalse;
 }

data/lib/xcodeproj/command.rb

@@ -6,6 +6,7 @@ module Xcodeproj
     autoload :TargetDiff,  'xcodeproj/command/target_diff'
     autoload :ProjectDiff, 'xcodeproj/command/project_diff'
     autoload :Show,        'xcodeproj/command/show'
+    autoload :Sort,        'xcodeproj/command/sort'
 
     class Help < StandardError
       def initialize(command_class, argv, unrecognized_command = nil)
@@ -45,7 +46,7 @@ module Xcodeproj
     end
 
     def self.banner
-      commands = ['target-diff', 'project-diff', 'show']
+      commands = ['target-diff', 'project-diff', 'show', 'sort']
       banner   = "To see help for the available commands run:\n\n"
       banner + commands.map { |cmd| "  * $ xcodeproj #{cmd.green} --help" }.join("\n")
     end
@@ -92,6 +93,7 @@ module Xcodeproj
       when 'target-diff'  then TargetDiff
       when 'project-diff' then ProjectDiff
       when 'show'         then Show
+      when 'sort'         then Sort
       end
 
       if command_class.nil?
@@ -127,7 +129,7 @@ module Xcodeproj
     end
 
     def xcodeproj
-      @xcodeproj ||= Project.new(xcodeproj_path)
+      @xcodeproj ||= Project.open(xcodeproj_path)
     end
   end
 end

data/lib/xcodeproj/command/show.rb

@@ -19,7 +19,7 @@ module Xcodeproj
       def initialize(argv)
         xcodeproj_path = argv.shift_argument
         @xcodeproj_path = File.expand_path(xcodeproj_path) if xcodeproj_path
-        
+
         if argv.option('--format')
           @output_format = argv.shift_argument
         end

data/lib/xcodeproj/command/sort.rb

@@ -0,0 +1,29 @@
+module Xcodeproj
+  class Command
+    class Sort < Command
+      def self.banner
+%{Sorts the give project
+
+    $ sort [PROJECT]
+
+      If no `PROJECT' is specified then the current work directory is searched
+      for one.}
+      end
+
+      def initialize(argv)
+        xcodeproj_path = argv.shift_argument
+        @xcodeproj_path = File.expand_path(xcodeproj_path) if xcodeproj_path
+        super unless argv.empty?
+      end
+
+      def run
+        xcodeproj.sort
+        xcodeproj.save
+        puts "The `#{File.basename(xcodeproj_path)}` project was sorted"
+      end
+    end
+  end
+end
+
+
+

data/lib/xcodeproj/constants.rb

@@ -22,7 +22,7 @@ module Xcodeproj
 
     # @return [String] The last known object version to Xcodeproj.
     #
-    LAST_UPGRADE_CHECK  = '0450'
+    LAST_UPGRADE_CHECK  = '0500'
 
     # @return [Hash] The all the known ISAs grouped by superclass.
     #
@@ -83,6 +83,7 @@ module Xcodeproj
       'sh'          => 'text.script.sh',
       'plist'       => 'text.plist.xml',
       'markdown'    => 'text',
+      'xcassets'    => 'folder.assetcatalog'
     }.freeze
 
     # @return [Hash] The uniform type identifier of various product types.
@@ -117,21 +118,17 @@ module Xcodeproj
         'GCC_SYMBOLS_PRIVATE_EXTERN'        => 'NO',
         'GCC_OPTIMIZATION_LEVEL'            => '0',
         'COPY_PHASE_STRIP'                  => 'NO',
-        # TODO: enable after Xcode 4
-        # 'ONLY_ACTIVE_ARCH'                  => 'YES',
       }.freeze,
       :release => {
         'OTHER_CFLAGS'                      => ['-DNS_BLOCK_ASSERTIONS=1', "$(inherited)"],
         'OTHER_CPLUSPLUSFLAGS'              => ['-DNS_BLOCK_ASSERTIONS=1', "$(inherited)"],
       }.freeze,
       :ios => {
-        'ARCHS'                             => "$(ARCHS_STANDARD_32_BIT)",
         'IPHONEOS_DEPLOYMENT_TARGET'        => '4.3',
         'PUBLIC_HEADERS_FOLDER_PATH'        => "$(TARGET_NAME)",
         'SDKROOT'                           => 'iphoneos',
       }.freeze,
       :osx => {
-        'ARCHS'                             => "$(ARCHS_STANDARD_64_BIT)",
         'GCC_ENABLE_OBJC_EXCEPTIONS'        => 'YES',
         'GCC_VERSION'                       => 'com.apple.compilers.llvm.clang.1_0',
         'MACOSX_DEPLOYMENT_TARGET'          => '10.7',
@@ -139,7 +136,7 @@ module Xcodeproj
         'COMBINE_HIDPI_IMAGES'              => 'YES',
       }.freeze,
       [:osx, :debug] => {
-        'ONLY_ACTIVE_ARCH'                  => 'YES',
+        # Empty?
       }.freeze,
       [:osx, :release] => {
         'DEBUG_INFORMATION_FORMAT'          => 'dwarf-with-dsym',
@@ -158,8 +155,7 @@ module Xcodeproj
       :release => {
       }.freeze,
       :debug => {
-        # TODO: enable after Xcode 4
-        # 'ONLY_ACTIVE_ARCH' => 'YES',
+        'ONLY_ACTIVE_ARCH' => 'YES',
       }.freeze,
     }.freeze
 

data/lib/xcodeproj/gem_version.rb

@@ -1,6 +1,6 @@
 module Xcodeproj
   # The version of the xcodeproj gem.
   #
-  VERSION = '0.10.1' unless defined? Xcodeproj::VERSION
+  VERSION = '0.11.0' unless defined? Xcodeproj::VERSION
 end
 

data/lib/xcodeproj/project.rb

@@ -334,11 +334,11 @@ module Xcodeproj
       File.open(filename, 'wb') { |file| file.write(output) }
     end
 
-    #-------------------------------------------------------------------------#
 
     public
 
     # @!group Creating objects
+    #-------------------------------------------------------------------------#
 
     # Creates a new object with a suitable UUID.
     #
@@ -408,11 +408,11 @@ module Xcodeproj
       @available_uuids += uniques
     end
 
-    #-------------------------------------------------------------------------#
 
     public
 
     # @!group Convenience accessors
+    #-------------------------------------------------------------------------#
 
     # @return [Array<AbstractObject>] all the objects of the project.
     #
@@ -491,7 +491,7 @@ module Xcodeproj
     # @return [PBXGroup] the `Frameworks` group creating it if necessary.
     #
     def frameworks_group
-      main_group['Frameworks'] || new_group('Frameworks')
+      main_group['Frameworks'] || main_group.new_group('Frameworks')
     end
 
     # @return [ObjectList<XCBuildConfiguration>] A list of project wide
@@ -513,11 +513,11 @@ module Xcodeproj
       root_object.build_configuration_list.build_settings(name)
     end
 
-    #-------------------------------------------------------------------------#
 
     public
 
-    # @!group Helpers for generating objects
+    # @!group Helpers
+    #-------------------------------------------------------------------------#
 
     # Creates a new file reference in the main group.
     #
@@ -539,32 +539,6 @@ module Xcodeproj
       main_group.new_group(name, path, source_tree)
     end
 
-    # Adds a file reference for a system framework to the project if needed and
-    # adds it to the {PBXFrameworksBuildPhase} of the given target.
-    #
-    # @example Adding QuartzCore
-    #
-    #         framework = project.add_system_framework('QuartzCore', :ios)
-    #
-    #         target = project.targets.first
-    #         build_phase = target.frameworks_build_phases.first
-    #         build_phase.files << framework.buildFiles.new
-    #
-    # @param  [String] name
-    #         The name of a framework.
-    #
-    # @param  [PBXNativeTarget] target
-    #         The target to which to add the framework.
-    #
-    # @note   This method adds a reference to the highest know SDK for the
-    #         given platform.
-    #
-    # @return [PBXFileReference] The file reference of the framework.
-    #
-    def add_system_framework(name, target)
-      ProjectHelper.add_system_framework(self, name, target)
-    end
-
     # Creates a new target and adds it to the project.
     #
     # The target is configured for the given platform and its file reference it
@@ -637,7 +611,20 @@ module Xcodeproj
       end
     end
 
+    # Sorts the project.
+    #
+    # @return [void]
+    #
+    def sort
+      root_object.sort_recursively
+    end
+
+
+    public
+
+    # @!group Helpers
     #-------------------------------------------------------------------------#
+
     # Get list of shared schemes in project
     #
     # @param [String] path
@@ -645,7 +632,7 @@ module Xcodeproj
     #
     # @return [Array]
     #
-    def self.schemes project_path
+    def self.schemes(project_path)
       schemes = Dir[File.join(project_path, 'xcshareddata', 'xcschemes', '*.xcscheme')].map do |scheme|
         File.basename(scheme, '.xcscheme')
       end

data/lib/xcodeproj/project/object.rb

@@ -131,9 +131,36 @@ module Xcodeproj
             isa.gsub(/^(PBX|XC)/, '')
           end
         end
-
         alias :to_s :display_name
 
+        # Sorts the to many attributes of the object according to the display
+        # name.
+        #
+        def sort
+          to_many_attributes.each do |attrb|
+            list = attrb.get_value(self)
+            list.sort! do |x, y|
+              x.display_name <=> y.display_name
+            end
+          end
+        end
+
+        # Sorts the object and the objects that it references.
+        #
+        def sort_recursively
+          to_one_attributes.each do |attrb|
+            value = attrb.get_value(self)
+            value.sort_recursively if value
+          end
+
+          to_many_attributes.each do |attrb|
+            list = attrb.get_value(self)
+            list.each(&:sort_recursively)
+          end
+
+          sort
+        end
+
         # @!group Reference counting
 
         # @return [Array<ObjectList>] The list of the objects that have a

data/lib/xcodeproj/project/object/build_configuration.rb

@@ -23,11 +23,11 @@ module Xcodeproj
         #
         has_one :base_configuration_reference, PBXFileReference
 
-        #---------------------------------------------------------------------#
 
         public
 
         # @!group AbstractObject Hooks
+        #---------------------------------------------------------------------#
 
         # @return [Hash{String => Hash}] A hash suitable to display the object
         #         to the user.
@@ -41,6 +41,25 @@ module Xcodeproj
           { name => data }
         end
 
+
+        public
+
+        # @!group Helpers
+        # --------------------------------------------------------------------#
+
+        # Sorts the build settings. Valid only in Ruby > 1.9.2 because in
+        # previous versions the hash are not sorted.
+        #
+        # @return [void]
+        #
+        def sort
+          sorted = {}
+          build_settings.keys.sort.each do |key|
+            sorted[key] = build_settings[key]
+          end
+          self.build_settings = sorted
+        end
+
         #---------------------------------------------------------------------#
 
       end

data/lib/xcodeproj/project/object/build_phase.rb

@@ -48,37 +48,62 @@ module Xcodeproj
         #         referenced by this build phase.
         #
         def files_references
-          files.map { |bf| bf.file_ref }.uniq
+          files.map { |bf| bf.file_ref }
+        end
+
+        # @return [Array<String>] The display name of the build files.
+        #
+        def file_display_names
+          files.map(&:display_name)
+        end
+
+        # @return [PBXBuildFile] the first build file associated with the given
+        #         file reference if one exists.
+        #
+        def build_file(file_ref)
+          (file_ref.referrers & files).first
+        end
+
+        # Returns whether a build file for the given file reference exists.
+        #
+        # @param  [PBXFileReference] file_ref
+        #
+        # @return [Bool] whether the reference is already present.
+        #
+        def include?(file_ref)
+          !build_file(file_ref).nil?
         end
 
         # Adds a new build file, initialized with the given file reference, to
         # the phase.
         #
-        # @param  [PBXFileReference] file
-        #         the file reference that should be added to the build phase.
+        # @param  [PBXFileReference] file_ref
+        #         The file reference that should be added to the build phase.
         #
         # @return [PBXBuildFile] the build file generated.
         #
-        def add_file_reference(file)
-          build_file = project.new(PBXBuildFile)
-          build_file.file_ref = file
-          files << build_file
-          build_file
+        def add_file_reference(file_ref, avoid_duplicates = false)
+          if avoid_duplicates && existing = build_file(file_ref)
+            existing
+          else
+            build_file = project.new(PBXBuildFile)
+            build_file.file_ref = file_ref
+            files << build_file
+            build_file
+          end
         end
 
         # Removes the build file associated with the given file reference from
         # the phase.
         #
-        # @param  [PBXFileReference] file the file to remove
+        # @param  [PBXFileReference] file_ref
+        #         The file to remove
         #
         # @return [void]
         #
-        def remove_file_reference(file)
-          build_file = files.find { |bf| bf.file_ref == file }
-          if build_file
-            build_file.file_ref = nil
-            build_file.remove_from_project
-          end
+        def remove_file_reference(file_ref)
+          build_file = files.find { |bf| bf.file_ref == file_ref }
+          remove_build_file(build_file) if build_file
         end
 
         # Removes a build file from the phase and clears its relationship to
@@ -98,11 +123,12 @@ module Xcodeproj
         #
         # @return [void]
         #
-        def clear_build_files
+        def clear
           files.objects.each do |bf|
             remove_build_file(bf)
           end
         end
+        alias :clear_build_files :clear
 
       end
 

data/lib/xcodeproj/project/object/configuration_list.rb

@@ -26,11 +26,11 @@ module Xcodeproj
         #
         has_many :build_configurations, XCBuildConfiguration
 
-        #---------------------------------------------------------------------#
 
         public
 
         # @!group Helpers
+        # --------------------------------------------------------------------#
 
         # Returns the build configuration with the given name.
         #

data/lib/xcodeproj/project/object/file_reference.rb

@@ -158,6 +158,31 @@ module Xcodeproj
           GroupableHelper.real_path(self)
         end
 
+        # Sets the source tree of the reference.
+        #
+        # @param  [Symbol, String] source_tree
+        #         The source tree, either a string or a symbol.
+        #
+        # @return [void]
+        #
+        def set_source_tree(source_tree)
+          GroupableHelper.set_source_tree(self, source_tree)
+        end
+
+        # Allows to set the path according to the source tree of the reference.
+        #
+        # @param  [#to_s] the path for the reference.
+        #
+        # @return [void]
+        #
+        def set_path(path)
+          if path
+            GroupableHelper.set_path_with_source_tree(self, path, source_tree)
+          else
+            self.path = nil
+          end
+        end
+
         # @return [Array<PBXBuildFile>] the build files associated with the
         #         current file reference.
         #

data/lib/xcodeproj/project/object/group.rb

@@ -78,24 +78,11 @@ module Xcodeproj
         #
         attribute :comments, String
 
-        #---------------------------------------------------------------------#
 
         public
 
         # @!group Helpers
-
-        # @return [String] the name of the group taking into account the path
-        #         or other factors if needed.
-        #
-        def display_name
-          if name
-            name
-          elsif path
-            File.basename(path)
-          elsif self.equal?(project.main_group)
-            'Main Group'
-          end
-        end
+        #---------------------------------------------------------------------#
 
         # @return [PBXGroup, PBXProject] The parent of the group.
         #
@@ -127,13 +114,47 @@ module Xcodeproj
           GroupableHelper.real_path(self)
         end
 
-        # @return [Array<PBXFileReference>] the files references in the group
+        # Sets the source tree of the group.
+        #
+        # @param  [Symbol, String] source_tree
+        #         The source tree, either a string or a symbol.
+        #
+        # @return [void]
+        #
+        def set_source_tree(source_tree)
+          GroupableHelper.set_source_tree(self, source_tree)
+        end
+
+        # Allows to set the path according to the source tree of the group.
+        #
+        # @param  [#to_s] the path for the group.
+        #
+        # @return [void]
+        #
+        def set_path(path)
+          if path
+            source_tree
+            GroupableHelper.set_path_with_source_tree(self, path, source_tree)
+          else
+            self.path = nil
+            self.source_tree = '<group>'
+          end
+        end
+
+        # @return [Array<PBXFileReference>] the file references in the group
         #         children.
         #
         def files
           children.select { |obj| obj.class == PBXFileReference }
         end
 
+        # @return [PBXFileReference] The file references whose path (regardless
+        # of the source tree) matches the give path.
+        #
+        def find_file_by_path(path)
+          files.find { |ref| ref.path == path }
+        end
+
         # @return [Array<PBXGroup>] the groups in the group children.
         #
         def groups
@@ -219,11 +240,8 @@ module Xcodeproj
           group = project.new(PBXGroup)
           children << group
           group.name = name
-          if path
-            GroupableHelper.set_path_with_source_tree(group, path, source_tree)
-          else
-            group.source_tree = '<group>'
-          end
+          group.set_source_tree(source_tree)
+          group.set_path(path)
           group
         end
 
@@ -238,11 +256,10 @@ module Xcodeproj
 
         # Removes children files and groups under this group.
         #
-        # @TODO: remove from project should suffice.
-        #
-        def remove_children_recursively
+        def clear
           children.objects.each(&:remove_from_project)
         end
+        alias :remove_children_recursively :clear
 
         # Traverses the children groups and finds the children with the given
         # path, optionally, creating any needed group. If the given path is
@@ -303,12 +320,20 @@ module Xcodeproj
         #
         def sort_by_type
           children.sort! do |x, y|
-            if x.is_a?(PBXGroup) && y.is_a?(PBXFileReference)
+            if x.isa == 'PBXGroup' && !(y.isa == 'PBXGroup')
               -1
-            elsif x.is_a?(PBXFileReference) && y.is_a?(PBXGroup)
+            elsif !(x.isa == 'PBXGroup') && y.isa == 'PBXGroup'
               1
+            elsif x.display_name && y.display_name
+              extname_x = File.extname(x.display_name)
+              extname_y = File.extname(y.display_name)
+              if extname_x != extname_y
+                extname_x <=> extname_y
+              else
+                File.basename(x.display_name, ".*" ) <=> File.basename(y.display_name, ".*" )
+              end
             else
-              x.display_name <=> y.display_name
+              0
             end
           end
         end
@@ -321,6 +346,32 @@ module Xcodeproj
           groups.each { |group| group.recursively_sort_by_type }
           sort_by_type
         end
+
+
+        public
+
+        # @!group AbstractObject Hooks
+        #---------------------------------------------------------------------#
+
+        # @return [String] the name of the group taking into account the path
+        #         or other factors if needed.
+        #
+        def display_name
+          if name
+            name
+          elsif path
+            File.basename(path)
+          elsif self.equal?(project.main_group)
+            'Main Group'
+          end
+        end
+
+        # Sorts the to many attributes of the object according to the display
+        # name.
+        #
+        def sort
+          sort_by_type
+        end
       end
 
       #-----------------------------------------------------------------------#

data/lib/xcodeproj/project/object/helpers/groupable_helper.rb

@@ -108,11 +108,10 @@ module Xcodeproj
               end
             when 'SOURCE_ROOT'
               object.project.path.dirname
-            when '<absolute>', 'BUILT_PRODUCTS_DIR', 'DEVELOPER_DIR'
+            when '<absolute>'
               nil
             else
-              raise "[Xcodeproj] Unable to compute the source tree for " \
-                " `#{object.display_name}`: `#{object.source_tree}`"
+              Pathname.new("${#{object.source_tree}}")
             end
           end
 
@@ -128,6 +127,19 @@ module Xcodeproj
             :sdk_root        => 'SDKROOT',
           }.freeze
 
+          # Sets the source tree of the given object.
+          #
+          # @param  [Symbol, String] source_tree
+          #         The source tree, either a string or a key for
+          #         {SOURCE_TREES_BY_KEY}.
+          #
+          # @return [void]
+          #
+          def set_source_tree(object, source_tree)
+            source_tree = normalize_source_tree(source_tree)
+            object.source_tree = source_tree
+          end
+
           # Sets the path of the given object according to the provided source
           # tree key. The path is converted to relative according to the real
           # path of the source tree for group and project source trees, if both
@@ -140,28 +152,24 @@ module Xcodeproj
           # @param  [#to_s] path
           #         The path.
           #
-          # @param  [Symbol] source_tree_key
-          #         The source tree type, see {SOURCE_TREES_BY_KEY} for
-          #         acceptable values.
+          # @param  [Symbol, String] source_tree
+          #         The source tree, either a string or a key for
+          #         {SOURCE_TREES_BY_KEY}.
           #
           # @return [void]
           #
-          def set_path_with_source_tree(object, path, source_tree_key)
+          def set_path_with_source_tree(object, path, source_tree)
             path = Pathname.new(path)
-            source_tree = SOURCE_TREES_BY_KEY[source_tree_key]
+            source_tree = normalize_source_tree(source_tree)
             object.source_tree = source_tree
 
-            unless source_tree
-              raise "[Xcodeproj] Unrecognized source tree option `#{source_tree_key}` for path `#{path}`"
-            end
-
-            if source_tree_key == :absolute
+            if source_tree == SOURCE_TREES_BY_KEY[:absolute]
               unless path.absolute?
                 raise "[Xcodeproj] Attempt to set a relative path with an " \
                   "absolute source tree: `#{path}`"
               end
               object.path = path.to_s
-            elsif source_tree_key == :group || source_tree_key == :project
+            elsif source_tree == SOURCE_TREES_BY_KEY[:group] || source_tree == SOURCE_TREES_BY_KEY[:project]
               source_tree_real_path = GroupableHelper.source_tree_real_path(object)
               if source_tree_real_path && source_tree_real_path.absolute? == path.absolute?
                 relative_path = path.relative_path_from(source_tree_real_path)
@@ -185,7 +193,7 @@ module Xcodeproj
           # @return [void]
           #
           def check_parents_integrity(object)
-            referrers_count = object.referrers.count
+            referrers_count = object.referrers.uniq.count
             if referrers_count > 1
               referrers_count = object.referrers.select{ |obj| obj.isa == 'PBXGroup' }.count
             end
@@ -193,7 +201,7 @@ module Xcodeproj
             if referrers_count == 0
               raise "[Xcodeproj] Consistency issue: no parent " \
                 "for object `#{object.display_name}`: "\
-                "#{object.referrers}"
+                "`#{object.referrers.join('`, `')}`"
             elsif referrers_count > 1
               raise "[Xcodeproj] Consistency issue: unexpected multiple parents " \
                 "for object `#{object.display_name}`: "\
@@ -201,6 +209,25 @@ module Xcodeproj
             end
           end
 
+          # Converts the given source tree to its string value.
+          #
+          # @param  [Symbol, String] source_tree
+          #         The source tree, either a string or a key for
+          #         {SOURCE_TREES_BY_KEY}.
+          #
+          # @return [String] the string value of the source tree.
+          #
+          def normalize_source_tree(source_tree)
+            if source_tree.is_a?(Symbol)
+              source_tree = SOURCE_TREES_BY_KEY[source_tree]
+            end
+
+            unless SOURCE_TREES_BY_KEY.values.include?(source_tree)
+              raise "[Xcodeproj] Unrecognized source tree option `#{source_tree}`"
+            end
+            source_tree
+          end
+
           #-------------------------------------------------------------------#
 
         end

data/lib/xcodeproj/project/object/native_target.rb

@@ -26,15 +26,16 @@ module Xcodeproj
         #
         has_one :build_configuration_list, XCConfigurationList
 
-        # @return [PBXNativeTarget] the targets necessary to build this target.
+        # @return [ObjectList<PBXTargetDependency>] the targets necessary to
+        #         build this target.
         #
         has_many :dependencies, PBXTargetDependency
 
-        #--------------------------------------#
 
         public
 
         # @!group Helpers
+        #--------------------------------------#
 
         # @return [String] the SDK that the target should use.
         #
@@ -137,17 +138,19 @@ module Xcodeproj
         # @return [void]
         #
         def add_dependency(target)
-          container_proxy = project.new(Xcodeproj::Project::PBXContainerItemProxy)
-          container_proxy.container_portal = project.root_object.uuid
-          container_proxy.proxy_type = '1'
-          container_proxy.remote_global_id_string = target.uuid
-          container_proxy.remote_info = target.name
-
-          dependency = project.new(Xcodeproj::Project::PBXTargetDependency)
-          dependency.target = target
-          dependency.target_proxy = container_proxy
-
-          dependencies << dependency
+          unless dependencies.map(&:target).include?(target)
+            container_proxy = project.new(Xcodeproj::Project::PBXContainerItemProxy)
+            container_proxy.container_portal = project.root_object.uuid
+            container_proxy.proxy_type = '1'
+            container_proxy.remote_global_id_string = target.uuid
+            container_proxy.remote_info = target.name
+
+            dependency = project.new(Xcodeproj::Project::PBXTargetDependency)
+            dependency.target = target
+            dependency.target_proxy = container_proxy
+
+            dependencies << dependency
+          end
         end
 
         # Creates a new copy files build phase.
@@ -177,11 +180,56 @@ module Xcodeproj
           phase
         end
 
+
+        public
+
+        # @!group System frameworks
         #--------------------------------------#
 
+        # Adds a file reference for one or more system framework to the project
+        # if needed and adds them to the Frameworks build phases.
+        #
+        # @param  [Array<String>, String] name
+        #         The name or the list of the names of the framework.
+        #
+        # @return [void]
+        #
+        def add_system_framework(names)
+          Array(names).each do |name|
+            path = "System/Library/Frameworks/#{name}.framework"
+            unless ref = project.frameworks_group.find_file_by_path(path)
+              ref = project.frameworks_group.new_file(path, :sdk_root)
+            end
+            frameworks_build_phase.add_file_reference(ref, true)
+            ref
+          end
+        end
+        alias :add_system_frameworks :add_system_framework
+
+        # Adds a file reference for one or more system libraries to the project
+        # if needed and adds them to the Frameworks build phases.
+        #
+        # @param  [Array<String>, String] name
+        #         The name or the list of the names of the libraries.
+        #
+        # @return [void]
+        #
+        def add_system_library(names)
+          Array(names).each do |name|
+            path = "usr/lib/lib#{name}.dylib"
+            unless ref = project.frameworks_group.files.find { |ref| ref.path == path }
+              ref = project.frameworks_group.new_file(path, :sdk_root)
+            end
+            frameworks_build_phase.add_file_reference(ref, true)
+            ref
+          end
+        end
+        alias :add_system_libraries :add_system_library
+
         public
 
         # @!group AbstractObject Hooks
+        #--------------------------------------#
 
         # @return [Hash{String => Hash}] A hash suitable to display the object
         #         to the user.
@@ -221,7 +269,8 @@ module Xcodeproj
         #
         attribute :product_install_path, String
 
-        # @return [PBXBuildRule] the build phases of the target.
+        # @return [ObjectList<AbstractBuildPhase>] the build phases of the
+        #         target.
         #
         # @note   Apparently only PBXCopyFilesBuildPhase and
         #         PBXShellScriptBuildPhase can appear multiple times in a
@@ -229,11 +278,11 @@ module Xcodeproj
         #
         has_many :build_phases, AbstractBuildPhase
 
-        #--------------------------------------#
 
         public
 
         # @!group Helpers
+        #--------------------------------------#
 
         # Adds source files to the target.
         #
@@ -349,6 +398,26 @@ module Xcodeproj
           phase
         end
 
+
+        public
+
+        # @!group AbstractObject Hooks
+        #--------------------------------------#
+
+        # Sorts the to many attributes of the object according to the display
+        # name.
+        #
+        # Build phases are not sorted as they order is relevant.
+        #
+        def sort
+          attributes_to_sort = to_many_attributes.reject { |attr| attr.name == :build_phases }
+          attributes_to_sort.each do |attrb|
+            list = attrb.get_value(self)
+            list.sort! do |x, y|
+              x.display_name <=> y.display_name
+            end
+          end
+        end
       end
 
       #-----------------------------------------------------------------------#

data/lib/xcodeproj/project/object/target_dependency.rb

@@ -27,6 +27,20 @@ module Xcodeproj
         #         target from a nested Xcode project.
         #
         attribute :name, String
+
+
+        public
+
+        # @!group AbstractObject Hooks
+        #--------------------------------------#
+
+        # @return [String] The name of the dependency.
+        #
+        def display_name
+          return name if name
+          return target.name if target
+          return target_proxy.remote_info if target_proxy
+        end
       end
     end
   end

data/lib/xcodeproj/project/object_attributes.rb

@@ -61,10 +61,17 @@ module Xcodeproj
             # `_id_` would become `Id`
             'remoteGlobalIDString'
           else
-            name.to_s.camelize(:lower)
+            self.class.plist_name_store[name] ||= name.to_s.camelize(:lower)
           end
         end
 
+        # @return [Hash] a shared store which cahces the plist name of the
+        #         attributes.
+        #
+        def self.plist_name_store
+          @plist_name_store ||= {}
+        end
+
         # @return [Array<Class>] the list of the classes accepted by the
         #   attribute.
         #

data/lib/xcodeproj/project/object_list.rb

@@ -34,10 +34,6 @@ module Xcodeproj
       #
       attr_reader :owner
 
-      #------------------------------------------------------------------------#
-
-      # @!group ObjectList
-
       # @return [Array<String>]
       #   the UUIDs of all the objects referenced by this list.
       #
@@ -52,9 +48,11 @@ module Xcodeproj
         to_a
       end
 
-      #------------------------------------------------------------------------#
+
+      public
 
       # @!group Notification enabled methods
+      #------------------------------------------------------------------------#
 
       # TODO: the overridden methods are incomplete.
 
@@ -66,11 +64,11 @@ module Xcodeproj
       # @return [void]
       #
       def +(objects)
-        super
         perform_additions_operations(objects)
+        super
       end
 
-      # Adds an object to list the and updates its references count.
+      # Appends an object to list the and updates its references count.
       #
       # @param  [AbstractObject, ObjectDictionary] object
       #         The object to add to the list.
@@ -78,8 +76,21 @@ module Xcodeproj
       # @return [void]
       #
       def <<(object)
+        perform_additions_operations(object)
         super
+      end
+
+      # Adds an object to the given index of the list the and updates its
+      # references count.
+      #
+      # @param  [AbstractObject, ObjectDictionary] object
+      #         The object to add to the list.
+      #
+      # @return [void]
+      #
+      def insert(index, object)
         perform_additions_operations(object)
+        super
       end
 
       # Prepends an object to the list and updates its references count.
@@ -90,8 +101,8 @@ module Xcodeproj
       # @return [void]
       #
       def unshift(object)
-        super
         perform_additions_operations(object)
+        super
       end
 
       # Removes an object to list and updates its references count.
@@ -99,11 +110,25 @@ module Xcodeproj
       # @param [AbstractObject, ObjectDictionary] object
       #   the object to delete from the list.
       #
-      # @return [void]
+      # @return [AbstractObject, ObjectDictionary, Nil] the object if found.
       #
       def delete(object)
+        perform_deletion_operations(object)
         super
+      end
+
+      # Removes the object at the given index from the list and updates its
+      # references count.
+      #
+      # @param [Fixnum] from
+      #        The index of the object.
+      #
+      # @return [AbstractObject, ObjectDictionary, Nil] the object if found.
+      #
+      def delete_at(index)
+        object = at(index)
         perform_deletion_operations(object)
+        super
       end
 
       # Removes all the objects contained in the list and updates their
@@ -118,12 +143,48 @@ module Xcodeproj
         super
       end
 
-      #------------------------------------------------------------------------#
+      # Moves the object at the given given index to the given position.
+      #
+      # @param [Fixnum] from
+      #        The current index of the object.
+      #
+      # @param [Fixnum] to
+      #        The new index for the object.
+      #
+      # @return [void]
+      #
+      def move(object, new_index)
+        if obj = delete(object)
+          insert(new_index, obj)
+        else
+          raise "Attempt to move object `#{object}` not present in the list `#{self.inspect}`"
+        end
+      end
+
+      # Moves the object at the given given index to the given position.
+      #
+      # @param [Fixnum] from
+      #        The current index of the object.
+      #
+      # @param [Fixnum] to
+      #        The new index for the object.
+      #
+      # @return [void]
+      #
+      def move_from(current_index, new_index)
+        if obj = delete_at(current_index)
+          insert(new_index, obj)
+        else
+          raise "Attempt to move object from index `#{current_index}` which is beyond bounds of the list `#{self.inspect}`"
+        end
+      end
 
-      # @!group Notification Methods
 
       private
 
+      # @!group Notification Methods
+      #------------------------------------------------------------------------#
+
       # Informs an object that it was added to the list. In practice it adds
       # the owner of the list as referrer to the objects. It also validates the
       # value.

data/lib/xcodeproj/project/project_helper.rb

@@ -55,7 +55,7 @@ module Xcodeproj
 
         # Frameworks
         framework_name = (platform == :ios) ? 'Foundation' : 'Cocoa'
-        framework_ref = project.add_system_framework(framework_name, target)
+        framework_ref = target.add_system_framework(framework_name)
 
         target
       end
@@ -115,55 +115,6 @@ module Xcodeproj
         target
       end
 
-      # @!group System Frameworks
-
-      #-----------------------------------------------------------------------#
-
-      # Adds a file reference for a system framework to the project if needed
-      # and adds it to the {PBXFrameworksBuildPhase} of the given target.
-      #
-      # @param  [Project] project
-      #         the project to which the configuration list should be added.
-      #
-      # @param  [String] name
-      #         The name of a framework.
-      #
-      # @param  [PBXNativeTarget] target
-      #         The target to which to add the framework.
-      #
-      # @note   This method adds a reference to the highest know SDK for the
-      #         given platform.
-      #
-      # @return [PBXFileReference] The file reference of the framework.
-      #
-      def self.add_system_framework(project, name, target)
-        sdk = target.sdk
-        raise "Unable to find and SDK for the target `#{target.name}`" unless sdk
-        if sdk.include?('iphoneos')
-          if sdk == 'iphoneos'
-            version = XcodebuildHelper.instance.last_ios_sdk || Constants::LAST_KNOWN_IOS_SDK
-            base_dir = "Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS#{version}.sdk/"
-          else
-            base_dir = "Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS#{sdk.gsub('iphoneos', '')}.sdk/"
-          end
-        elsif sdk.include?('macosx')
-          if sdk == 'macosx'
-            version = XcodebuildHelper.instance.last_osx_sdk || Constants::LAST_KNOWN_OSX_SDK
-            base_dir = "Platforms/MacOSX.platform/Developer/SDKs/MacOSX#{version}.sdk/"
-          else
-            base_dir = "Platforms/MacOSX.platform/Developer/SDKs/MacOSX#{sdk.gsub('macosx', '')}.sdk/"
-          end
-        end
-
-        path = base_dir + "System/Library/Frameworks/#{name}.framework"
-        ref = project.frameworks_group.files.find { |f| f.path == path }
-        unless ref
-          ref = project.frameworks_group.new_file(path, :developer_dir)
-        end
-
-        target.frameworks_build_phase.add_file_reference(ref)
-        ref
-      end
 
       # @!group Private Helpers
 

data/lib/xcodeproj/project/xcproj_helper.rb

@@ -18,7 +18,7 @@ module Xcodeproj
         #
         def touch(path)
           if available?
-            command = "xcproj --project #{path} touch"
+            command = "xcproj --project \"#{path}\" touch"
             success, output = execute(command)
             unless success
               message = "xcproj failed to touch the project. Check whether you installation of xcproj is functional.\n\n"

data/lib/xcodeproj/workspace.rb

@@ -51,7 +51,7 @@ module Xcodeproj
     def self.from_s(xml, workspace_path='')
       document = REXML::Document.new(xml)
       projpaths = document.get_elements("/Workspace/FileRef").map do |node|
-        node.attribute("location").to_s.sub(/^group:/, '')
+        node.attribute("location").value.sub(/^group:/, '')
       end
       instance = new(projpaths)
       instance.load_schemes(workspace_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -50,6 +50,7 @@ extra_rdoc_files: []
 files:
 - lib/xcodeproj/command/project_diff.rb
 - lib/xcodeproj/command/show.rb
+- lib/xcodeproj/command/sort.rb
 - lib/xcodeproj/command/target_diff.rb
 - lib/xcodeproj/command.rb
 - lib/xcodeproj/config.rb