xcodeproj 0.4.0.rc6 → 0.4.0.rc7

data/lib/xcodeproj.rb

@@ -1,5 +1,5 @@
 module Xcodeproj
-  VERSION = '0.4.0.rc6'
+  VERSION = '0.4.0.rc7'
 
   class PlainInformative < StandardError
   end

data/lib/xcodeproj/command.rb

@@ -66,11 +66,14 @@ module Xcodeproj
 
     rescue Interrupt
       puts "[!] Cancelled".red
-      Config.instance.verbose? ? raise : exit(1)
+      #Config.instance.verbose? ? raise : exit(1)
+      exit(1)
 
     rescue Exception => e
       puts e.message
-      puts *e.backtrace
+      unless e.is_a?(Informative)
+        puts *e.backtrace
+      end
       exit 1
     end
 

data/lib/xcodeproj/command/project_diff.rb

@@ -2,15 +2,14 @@ module Xcodeproj
   class Command
     class ProjectDiff < Command
       def self.banner
-%{Installing dependencies of a project:
+%{Shows the difference between two projects:
 
     $ project-diff PROJECT_1 PROJECT_2
 
-      Shows the difference between two projects in an UUID agnostic fashion.
+      It shows the difference in a UUID agnostic fashion.
 
       To reduce the noise (and to simplify implementation) differences in the
-      other of arrays are ignored.
-}
+      order of arrays are ignored.}
       end
 
       def self.options
@@ -20,6 +19,9 @@ module Xcodeproj
       def initialize(argv)
         @path_project1  = argv.shift_argument
         @path_project2  = argv.shift_argument
+        unless @path_project1 && @path_project2
+          raise Informative, "Two project paths are required."
+        end
         @keys_to_ignore = []
         while (idx = argv.index('--ignore'))
           @keys_to_ignore << argv.delete_at(idx + 1)

data/lib/xcodeproj/command/show.rb

@@ -2,24 +2,16 @@ module Xcodeproj
   class Command
     class Show < Command
       def self.banner
-%{Installing dependencies of a project:
+%{Shows an overview of a project in a YAML representation.'
 
-    $ project-diff PROJECT_1 PROJECT_2
+    $ show [PROJECT]
 
-      Shows a YAML reppresentation of a project.
-}
-      end
-
-      def self.options
-        [
-          ["--project PATH", "The Xcode project document to use."],
-        ].concat(super)
+      If no `PROJECT' is specified then the current work directory is searched
+      for one.}
       end
 
       def initialize(argv)
-        if argv.option('--project')
-          @xcodeproj_path = File.expand_path(argv.shift_argument)
-        end
+        @xcodeproj_path = File.expand_path(argv.shift_argument)
         super unless argv.empty?
       end
 

data/lib/xcodeproj/command/target_diff.rb

@@ -2,12 +2,11 @@ module Xcodeproj
   class Command
     class TargetDiff < Command
       def self.banner
-%{Installing dependencies of a project:
+%{Shows the difference between two targets:
 
     $ targets-diff [target 1] [target 2]
 
-      Shows the difference between two targets. (Only build source files atm.)
-}
+      Only supports build source files atm.}
       end
 
       def self.options

data/lib/xcodeproj/project.rb

@@ -176,13 +176,13 @@ module Xcodeproj
     #
     def new_from_plist(uuid, objects_by_uuid_plist, root_object = false)
       attributes = objects_by_uuid_plist[uuid]
-      raise "[Xcodeproj] Unable to find attributes for UUID #{uuid}" unless attributes
-      klass = Object.const_get(attributes['isa'])
-      object = klass.new(self, uuid)
-      object.add_referrer(self) if root_object
-
-      object.configure_with_plist(objects_by_uuid_plist)
-      object
+      if attributes
+        klass = Object.const_get(attributes['isa'])
+        object = klass.new(self, uuid)
+        object.add_referrer(self) if root_object
+        object.configure_with_plist(objects_by_uuid_plist)
+        object
+      end
     end
 
     # @return [Hash] The plist representation of the project.

data/lib/xcodeproj/project/object.rb

@@ -187,7 +187,7 @@ module Xcodeproj
           to_one_attributes.each do |attrb|
             ref_uuid = object_plist[attrb.plist_name]
             if ref_uuid
-              ref = project.objects_by_uuid[ref_uuid] || project.new_from_plist(ref_uuid, objects_by_uuid_plist)
+              ref = object_with_uuid(ref_uuid, objects_by_uuid_plist, attrb)
               attrb.set_value(self, ref)
             end
             object_plist.delete(attrb.plist_name)
@@ -197,7 +197,7 @@ module Xcodeproj
             ref_uuids = object_plist[attrb.plist_name] || []
             list = attrb.get_value(self)
             ref_uuids.each do |uuid|
-              list << object_with_uuid(uuid, objects_by_uuid_plist)
+              list << object_with_uuid(uuid, objects_by_uuid_plist, attrb)
             end
             object_plist.delete(attrb.plist_name)
           end
@@ -208,7 +208,7 @@ module Xcodeproj
             hashes.each do |hash|
               dictionary = ObjectDictionary.new(attrb, self)
               hash.each do |key, uuid|
-                dictionary[key] = object_with_uuid(uuid, objects_by_uuid_plist)
+                dictionary[key] = object_with_uuid(uuid, objects_by_uuid_plist, attrb)
               end
               list << dictionary
             end
@@ -218,21 +218,45 @@ module Xcodeproj
           unless object_plist.empty?
             raise "[!] Xcodeproj doesn't know about the following attributes " \
                   "#{object_plist} for the '#{isa}' isa.\n" \
-                  "Please file and issue: https://github.com/CocoaPods/Xcodeproj/issues/new"
+                  "Please file an issue: https://github.com/CocoaPods/Xcodeproj/issues/new"
           end
         end
 
-        def object_with_uuid(uuid, objects_by_uuid_plist)
-          project.objects_by_uuid[uuid] || project.new_from_plist(uuid, objects_by_uuid_plist)
+        # Initializes and returns the object with the given uuid.
+        #
+        # @param  [String] uuid
+        #         The UUID of the object that should be initialized.
+        #
+        # @param  [Hash{String=>String}] objects_by_uuid_plist
+        #         The hash contained by `objects` key of the plist containing
+        #         the information about the object that should be initialized.
+        #
+        # @param  [AbstractObjectAttribute] attribute
+        #         The attribute that requested the object. It is used only for
+        #         exceptions.
+        #
+        # @raise  If the hash for the given UUID contains an unknown ISA.
+        #
+        # @raise  If the UUID can't be found in the objects hash.
+        #
+        # @return [AbstractObject] the initialized object.
+        #
+        def object_with_uuid(uuid, objects_by_uuid_plist, attribute)
+          unless object = project.objects_by_uuid[uuid] || project.new_from_plist(uuid, objects_by_uuid_plist)
+            raise "`#{inspect}` attempted to initialize an object with an unknown UUID: "\
+                  "`#{uuid}` for attribute: `#{attribute.name}`\n"   \
+                  "Please file and issue: https://github.com/CocoaPods/Xcodeproj/issues/new"
+          end
+          object
         rescue NameError => exception
           attributes = objects_by_uuid_plist[uuid]
           raise "`#{isa}` attempted to initialize an object with unknown ISA "\
                 "`#{attributes['isa']}` from attributes: `#{attributes}`\n"   \
-                "Please file and issue: https://github.com/CocoaPods/Xcodeproj/issues/new"
+                "Please file an issue: https://github.com/CocoaPods/Xcodeproj/issues/new"
         end
 
         # @note the key for simple and to_one attributes usually appears only
-        #       if there is a value. To many keys always appear with an empty
+        #       if there is a value. To-many keys always appear with an empty
         #       array.
         #
         def to_plist
@@ -250,7 +274,7 @@ module Xcodeproj
           end
 
           to_many_attributes.each do |attrb|
-            list = attrb.get_value(self)
+          list = attrb.get_value(self)
             plist[attrb.plist_name] = list.uuids
           end
 
@@ -263,7 +287,7 @@ module Xcodeproj
         end
         alias :to_hash :to_plist
 
-        # Returns a cascade reppresentation of the object without UUIDs.
+        # Returns a cascade representation of the object without UUIDs.
         #
         # This method is designed to work in conjuction with {Hash#recursive_diff}
         # to provie a complete, yet redable, diff of two projects *not* affected by

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

@@ -23,6 +23,13 @@ module Xcodeproj
         #
         attribute :file_type, String
 
+        # @return [String] the pattern of the files that should be processed by
+        #   this rule. This attribute is an alternative to to `file_type`.
+        #
+        #   E.g. `*.css`.
+        #
+        attribute :file_patterns, String
+
         # @return [String] whether the rule is editable.
         #
         #   E.g. `1`.
@@ -32,7 +39,7 @@ module Xcodeproj
         # @return [ObjectList<PBXFileReference>] the file references for the
         #   output files.
         #
-        has_many :output_files, PBXFileReference
+        attribute :output_files, Array
 
         # @return [String] the content of the script to use for the build rule.
         #

data/lib/xcodeproj/project/object_attributes.rb

@@ -52,7 +52,7 @@ module Xcodeproj
         # @return[String] The name of the attribute in camel case.
         #
         # @example
-        #   attribute.new(:simple, project_root)
+        #   attribute.new(:simple, :project_root)
         #   attribute.plist_name #=> projectRoot
         #
         def plist_name
@@ -85,7 +85,7 @@ module Xcodeproj
         #   the value.
         #
         def get_value(object)
-          object.send("#{name}")
+          object.send(name)
         end
 
         # Convenience method that sets the value of this attribute for a
@@ -103,7 +103,7 @@ module Xcodeproj
         # @return [void]
         #
         def set_value(object, new_value)
-          raise "[Xcodeproj] Set value called for to many attribute" if type == :to_many
+          raise "[Xcodeproj] Set value called for a to-many attribute" if type == :to_many
           object.send("#{name}=", new_value)
         end
 
@@ -117,7 +117,7 @@ module Xcodeproj
         # @return [void]
         #
         def set_default(object)
-          raise "[Xcodeproj] Set value called for to many attribute" unless type == :simple
+          raise "[Xcodeproj] Set value called for a #{type} attribute" unless type == :simple
           set_value(object, default_value) if default_value
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 0.4.0.rc6
+  version: 0.4.0.rc7
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2012-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport