xcodeproj 0.4.3 → 0.5.0

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

@@ -24,15 +24,17 @@ module Xcodeproj
         #
         has_one :remote_ref, PBXContainerItemProxy
 
-        # @return   [String] the source tree for the path of the reference.
+        # @return [String] the source tree for the path of the reference.
         #
-        # @example  Possible value
-        #           "BUILT_PRODUCTS_DIR"
+        # @example
+        #   "BUILT_PRODUCTS_DIR"
         #
         attribute :source_tree, String
 
         #---------------------------------------------------------------------#
 
+        public
+
         # @!group Helpers
 
         # Checks whether the reference is a proxy.
@@ -43,6 +45,8 @@ module Xcodeproj
           true
         end
 
+        #---------------------------------------------------------------------#
+
       end
     end
   end

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

@@ -16,11 +16,11 @@ module Xcodeproj
         # @return [Hash{String => String}] attributes the attributes of the
         #         target.
         #
-        #   The hash might contain the following keys:
+        # @note   The hash might contain the following keys:
         #
-        #   - `CLASSPREFIX`
-        #   - `LastUpgradeCheck`
-        #   - `ORGANIZATIONNAME`
+        #         - `CLASSPREFIX`
+        #         - `LastUpgradeCheck`
+        #         - `ORGANIZATIONNAME`
         #
         attribute :attributes, Hash, {'LastUpgradeCheck' => '0450'}
 

data/lib/xcodeproj/project/object_attributes.rb

@@ -107,18 +107,21 @@ module Xcodeproj
           object.send("#{name}=", new_value)
         end
 
-        # Convenience method that sets the value of this attribute for a
-        #   given object to the default (if any).  It makes sense only for
-        #   `:simple` attributes.
+        # Convenience method that sets the value of this attribute for a given
+        # object to the default (if any).  It makes sense only for `:simple`
+        # attributes.
         #
-        # @param [AbstractObject] object
-        #   the object for which to set the default value.
+        # @param  [AbstractObject] object
+        #         the object for which to set the default value.
+        #
+        # @note   It is extremely important to duplicate the default values
+        #         otherwise kittens cry!
         #
         # @return [void]
         #
         def set_default(object)
           raise "[Xcodeproj] Set value called for a #{type} attribute" unless type == :simple
-          set_value(object, default_value) if default_value
+          set_value(object, default_value.dup) if default_value
         end
 
         # Checks that a given value is compatible with the attribute.

data/lib/xcodeproj/user_interface.rb

@@ -0,0 +1,26 @@
+module Xcodeproj
+
+  # Manages the UI output so clients can customize it.
+  #
+  module UserInterface
+
+    # Prints a message to standard output.
+    #
+    # @return [void]
+    #
+    def self.puts(message)
+      STDOUT.puts message
+    end
+
+    # Prints a message to standard error.
+    #
+    # @return [void]
+    #
+    def self.warn(message)
+      STDERR.puts message
+    end
+
+  end
+  UI = UserInterface
+end
+

data/lib/xcodeproj/workspace.rb

@@ -3,29 +3,28 @@ require 'rexml/document'
 
 module Xcodeproj
 
-  # The {Workspace} allows to generate, read and serialize Xcode Workspace
+  # Provides support for generating, reading and serializing Xcode Workspace
   # documents.
   #
   class Workspace
 
     # @return [Array<String>] the paths of the projects contained in the
-    #   workspace.
+    #         workspace.
     #
     attr_reader :projpaths
 
-    # Returns a new workspace initialized with the given `xcodeproj` paths.
-    #
-    # @param [String] projpaths
-    #   one or more `xcodeproj` paths.
+    # @param  [Array] projpaths @see projpaths
     #
     def initialize(*projpaths)
-      @projpaths = projpaths
+      @projpaths = projpaths.flatten
     end
 
+    #-------------------------------------------------------------------------#
+
     # Returns a workspace generated by reading the contents of the given path.
     #
-    # @param [String] path
-    #   the path of the `xcworkspace` file.
+    # @param  [String] path
+    #         the path of the `xcworkspace` file.
     #
     # @return [Workspace] the generated workspace.
     #
@@ -40,8 +39,8 @@ module Xcodeproj
     # Returns a workspace generated by reading the contents of the given
     # XML representation.
     #
-    # @param [String] xml
-    #   the XML representation of the workspace.
+    # @param  [String] xml
+    #         the XML representation of the workspace.
     #
     # @return [Workspace] the generated workspace.
     #
@@ -50,14 +49,16 @@ module Xcodeproj
       projpaths = document.get_elements("/Workspace/FileRef").map do |node|
         node.attribute("location").to_s.sub(/^group:/, '')
       end
-      new(*projpaths)
+      new(projpaths)
     end
 
+    #-------------------------------------------------------------------------#
+
     # Adds a new path to the list of the of projects contained in the
-    #   workspace.
+    # workspace.
     #
-    # @param [String] projpath
-    #   The path of the project to add.
+    # @param  [String] projpath
+    #         The path of the project to add.
     #
     # @return [void]
     #
@@ -67,8 +68,8 @@ module Xcodeproj
 
     # Checks if the workspace contains the project with the given path.
     #
-    # @param [String] projpath
-    #   The path of the project to add.
+    # @param  [String] projpath
+    #         The path of the project to add.
     #
     # @return [Boolean] whether the project is contained in the workspace.
     #
@@ -94,8 +95,8 @@ module Xcodeproj
 
     # Saves the workspace at the given `xcworkspace` path.
     #
-    # @param [String] path
-    #   the path where to save the project.
+    # @param  [String] path
+    #         the path where to save the project.
     #
     # @return [void]
     #
@@ -105,5 +106,8 @@ module Xcodeproj
         out << to_s
       end
     end
+
+    #-------------------------------------------------------------------------#
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -59,6 +59,7 @@ files:
 - lib/xcodeproj/command.rb
 - lib/xcodeproj/config.rb
 - lib/xcodeproj/constants.rb
+- lib/xcodeproj/differ.rb
 - lib/xcodeproj/helper.rb
 - lib/xcodeproj/project/object/build_configuration.rb
 - lib/xcodeproj/project/object/build_file.rb
@@ -76,8 +77,8 @@ files:
 - lib/xcodeproj/project/object_attributes.rb
 - lib/xcodeproj/project/object_dictionary.rb
 - lib/xcodeproj/project/object_list.rb
-- lib/xcodeproj/project/recursive_diff.rb
 - lib/xcodeproj/project.rb
+- lib/xcodeproj/user_interface.rb
 - lib/xcodeproj/workspace.rb
 - lib/xcodeproj.rb
 - ext/xcodeproj/extconf.rb

data/lib/xcodeproj/project/recursive_diff.rb

@@ -1,116 +0,0 @@
-class Hash
-
-  # Computes the recursive difference of two hashes.
-  #
-  # Useful to compare two projects.
-  #
-  # Inspired from 'active_support/core_ext/hash/diff'.
-  #
-  # @example
-  #   h1 = { :common => 'value', :changed => 'v1' }
-  #   h2 = { :common => 'value', :changed => 'v2', :addition => 'new_value' }
-
-  #   h1.recursive_diff(h2) == {
-  #     :changed => {
-  #       :self  => 'v1',
-  #       :other => 'v2'
-  #     },
-  #     :addition => {
-  #       :self  => nil,
-  #       :other => 'new_value'
-  #     }
-  #   } #=> true
-  #
-  # @return [Hash] Returns the recursive difference of a hash.
-  #
-  def recursive_diff(other, self_key = 'self', other_key = 'other')
-    if other.is_a?(Hash)
-      r = {}
-      all_keys = self.keys + other.keys
-      all_keys.each do |key|
-        v1 = self[key]
-        v2 = other[key]
-        diff = v1.recursive_diff(v2, self_key, other_key)
-        r[key] = diff if diff
-      end
-      r unless r == {}
-    else
-      super
-    end
-  end
-
-  # @return [void]
-  #
-  def recursive_delete(key_to_delete)
-    delete(key_to_delete)
-    self.each do |key, value|
-      case value
-      when Hash
-        value.recursive_delete(key_to_delete)
-      when Array
-        value.each { |v| v.recursive_delete(key_to_delete) if v.is_a?(Hash)}
-      end
-    end
-  end
-end
-
-
-class Array
-
-  # @return [Array]
-  #
-  def recursive_diff(other, self_key = 'self', other_key = 'other')
-    if other.is_a?(Array)
-      new_objects_self  = (self - other)
-      new_objects_other = (other - self)
-      unmatched_objects_self = []
-      array_result = []
-
-      # Try to match objects to reduce noise
-      new_objects_self.each do |value|
-        if value.is_a?(Hash)
-          other_value = new_objects_other.find do |other|
-            other.is_a?(Hash) && (value['displayName'] == other['displayName'])
-          end
-
-          if other_value
-            new_objects_other.delete(other_value)
-            match_diff = value.recursive_diff(other_value, self_key, other_key)
-            array_result << { value['displayName'] => match_diff} unless match_diff == {}
-          else
-            unmatched_objects_self << value
-          end
-        end
-      end
-
-      unless unmatched_objects_self.empty?
-        array_result << {
-          self_key => unmatched_objects_self.map do |v|
-            { v['displayName'] => v }
-          end
-        }
-      end
-
-      unless new_objects_other.empty?
-        array_result << {
-          other_key => new_objects_other.map do |v|
-            { v['displayName'] => v }
-          end
-        }
-      end
-
-      array_result unless array_result == []
-    else
-      super
-    end
-  end
-end
-
-class Object
-
-  # @return [Hash]
-  #
-  def recursive_diff(other, self_key = 'self', other_key = 'other')
-    { self_key => self, other_key => other } unless self == other
-  end
-end