xcodeproj 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e231a1ef01dd74e08eacdac936ea8b3cbac2c47c
-  data.tar.gz: ccaf12bb232a52d3e8de39063e68f211ea868d40
+  metadata.gz: 58c9efc19e5ebe6d1e236953a4ba523bd76284aa
+  data.tar.gz: 265bccb8aef4feda776f3161a2b7144d04092199
 SHA512:
-  metadata.gz: 709ac0aac0f7894e4b4b0dcbfdedaaf5ddf553d2d88417519c7aa77511b2148b9ec9511cca566ff8ad75bc122fa66126620ab3e058bb04bbbabf8fe50964ff02
-  data.tar.gz: 39b8796d646dc3fdf864d3ec6418b39d8715a90f4d15c32fd0f74e6c094cc84757d1c8eba716722a2c47533643f6425b72e5321140b081386c39e67e75dadc82
+  metadata.gz: 2f600fece068a72b186a2e4fbe2a62a96129256cd7c4356d1fce4e945ac2150e5f646acaae768fc534d968b5426a440e5dd0b245aaa473bffa853fc3e1eaa154
+  data.tar.gz: 0d36f633574ac627ed5737ebd6f963c2918f68fbf1afbd26d4b20e9f4e2989326aa548add0c3fa1910b1bbdeb55f9b4dcdd8dab45d7eabc8a51aa5c09c155aff

data/lib/xcodeproj/gem_version.rb

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

data/lib/xcodeproj/workspace.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'rexml/document'
+require 'xcodeproj/workspace/file_reference'
 
 module Xcodeproj
 
@@ -9,15 +10,16 @@ module Xcodeproj
   class Workspace
 
     # @return [Array<String>] the paths of the projects contained in the
+    # @return [Array<FileReference>] the paths of the projects contained in the
     #         workspace.
     #
-    attr_reader :projpaths
+    attr_reader :file_references
     attr_reader :schemes
 
-    # @param  [Array] projpaths @see projpaths
+    # @param  [Array] file_references @see file_references
     #
-    def initialize(*projpaths)
-      @projpaths = projpaths.flatten
+    def initialize(*file_references)
+      @file_references = file_references.flatten
       @schemes = {}
     end
 
@@ -50,10 +52,10 @@ 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").value.sub(/^group:/, '')
+      file_references = document.get_elements("/Workspace/FileRef").map do |node|
+        FileReference.from_node(node)
       end
-      instance = new(projpaths)
+      instance = new(file_references)
       instance.load_schemes(workspace_path)
       instance
     end
@@ -69,19 +71,20 @@ module Xcodeproj
     # @return [void]
     #
     def <<(projpath)
-      @projpaths << projpath
+      @file_references << projpath
       load_schemes_from_project File.expand_path(projpath)
     end
 
-    # Checks if the workspace contains the project with the given path.
+    # Checks if the workspace contains the project with the given file
+    # reference.
     #
-    # @param  [String] projpath
-    #         The path of the project to add.
+    # @param  [FileReference] file_reference
+    #         The file_reference to the project.
     #
     # @return [Boolean] whether the project is contained in the workspace.
     #
-    def include?(projpath)
-      @projpaths.include?(projpath)
+    def include?(file_reference)
+      @file_references.include?(file_reference)
     end
 
     # The template to generate a workspace XML representation.
@@ -92,10 +95,8 @@ module Xcodeproj
     #
     def to_s
       REXML::Document.new(TEMPLATE).tap do |document|
-        @projpaths.each do |projpath|
-          document.root << REXML::Element.new("FileRef").tap do |el|
-            el.attributes['location'] = "group:#{projpath}"
-          end
+        @file_references.each do |file_reference|
+          document.root << file_reference.to_node
         end
       end.to_s
     end
@@ -124,9 +125,9 @@ module Xcodeproj
     # @return [void]
     #
     def load_schemes workspace_dir_path
-      @projpaths.each do |projpath|
-        project_full_path = File.expand_path(File.join(workspace_dir_path, projpath))
-        load_schemes_from_project project_full_path
+      @file_references.each do |file_reference|
+        project_full_path = file_reference.absolute_path(workspace_dir_path)
+        load_schemes_from_project(project_full_path)
       end
     end
 

data/lib/xcodeproj/workspace/file_reference.rb

@@ -0,0 +1,87 @@
+module Xcodeproj
+  class Workspace
+    # Describes a file reference of a Workspace.
+    #
+    class FileReference
+      # @return [String] the path to the project
+      #
+      attr_reader :path
+
+      # @return [String] the type of reference to the project
+      #
+      # This can be of the following values:
+      # - absolute
+      # - group
+      # - container
+      # - developer (unsupported)
+      #
+      attr_reader :type
+
+      # @param [#to_s] path @see path
+      # @param [#to_s] type @see type
+      #
+      def initialize(path, type="group")
+        @path = path.to_s
+        @type = type.to_s
+      end
+
+      # @return [Bool] Wether a file reference is equal to another.
+      #
+      def ==(other)
+        path == other.path && type == other.type
+      end
+      alias_method :eql?, :==
+
+      # @return [Fixnum] A hash identical for equals objects.
+      #
+      def hash
+        [path, type].hash
+      end
+
+      # Returns a file reference given XML representation.
+      #
+      # @param  [REXML::Element] xml_node
+      #         the XML representation.
+      #
+      # @return [FileReference] The new file reference instance.
+      #
+      def self.from_node(xml_node)
+        type, path = xml_node.attribute('location').value.split(':', 2)
+        new(path, type)
+      end
+
+      # @return [REXML::Element] the XML representation of the file reference.
+      #
+      def to_node
+        REXML::Element.new("FileRef").tap do |element|
+          element.attributes['location'] = "#{type}:#{path}"
+        end
+      end
+
+      # Returns the absolute path of a file reference given the path of the
+      # directory containing workspace.
+      #
+      # @param  [#to_s] workspace_dir_path
+      #         The Path of the directory containing the workspace.
+      #
+      # @return [String] The absolute path to the project.
+      #
+      def absolute_path(workspace_dir_path)
+        workspace_dir_path = workspace_dir_path.to_s
+        case type
+        when 'group'
+          File.expand_path(File.join(workspace_dir_path, path))
+        when 'container'
+          File.expand_path(File.join(workspace_dir_path, path))
+        when 'absolute'
+          File.expand_path(path)
+        when 'developer'
+          raise "Developer workspace file reference type is not yet " \
+            "#{self}"
+        else
+          raise "Unsupported workspace file reference type #{type}"
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.0
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -92,6 +92,7 @@ files:
 - lib/xcodeproj/scheme.rb
 - lib/xcodeproj/user_interface.rb
 - lib/xcodeproj/workspace.rb
+- lib/xcodeproj/workspace/file_reference.rb
 - lib/xcodeproj/xcodebuild_helper.rb
 homepage: https://github.com/cocoapods/xcodeproj
 licenses: