xcodeproj 0.5.2 → 0.5.3

data/README.md

@@ -1,6 +1,7 @@
 # Xcodeproj
 
 [![Build Status](https://travis-ci.org/CocoaPods/Xcodeproj.png?branch=master)](https://travis-ci.org/CocoaPods/Xcodeproj)
+[![Coverage Status](https://coveralls.io/repos/CocoaPods/Xcodeproj/badge.png?branch=master)](https://coveralls.io/r/CocoaPods/Xcodeproj)
 
 Xcodeproj lets you create and modify Xcode projects from [Ruby][ruby].
 Script boring management tasks or build Xcode-friendly libraries. Also includes

data/lib/xcodeproj.rb

@@ -1,5 +1,5 @@
 module Xcodeproj
-  VERSION = '0.5.2' unless defined? Xcodeproj::VERSION
+  VERSION = '0.5.3' unless defined? Xcodeproj::VERSION
 
   class PlainInformative < StandardError
   end

data/lib/xcodeproj/command/show.rb

@@ -10,14 +10,40 @@ module Xcodeproj
       for one.}
       end
 
+      def self.options
+        [
+          ["--format [hash|tree_hash|raw]", "YAML output format, optional"],
+        ].concat(super)
+      end
+
       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
+
         super unless argv.empty?
       end
 
       def run
         require 'yaml'
+
+        if @output_format
+          case @output_format.to_sym
+          when :hash
+            puts xcodeproj.to_hash.to_yaml
+          when :tree_hash
+            puts xcodeproj.to_tree_hash.to_yaml
+          when :raw
+            puts xcodeproj.to_yaml
+          else
+            raise Informative, "Unknowh format #{@output_format}!"
+          end
+          return
+        end
+
         pretty_print = xcodeproj.pretty_print
         sections = []
         pretty_print.each do |key, value|

data/lib/xcodeproj/project.rb

@@ -186,12 +186,12 @@ module Xcodeproj
       end
     end
 
-    # @return [Hash] The plist representation of the project.
+    # @return [Hash] The hash representation of the project.
     #
     def to_hash
       plist = {}
       objects_dictionary = {}
-      objects.each { |obj| objects_dictionary[obj.uuid] = obj.to_plist }
+      objects.each { |obj| objects_dictionary[obj.uuid] = obj.to_hash }
       plist['objects']        =  objects_dictionary
       plist['archiveVersion'] =  archive_version.to_s
       plist['objectVersion']  =  object_version.to_s
@@ -200,8 +200,6 @@ module Xcodeproj
       plist
     end
 
-    alias :to_plist :to_hash
-
     # Converts the objects tree to a hash substituting the hash
     # of the referenced to their UUID reference. As a consequence the hash of
     # an object might appear multiple times and the information about their
@@ -251,7 +249,39 @@ module Xcodeproj
     def save_as(projpath)
       projpath = projpath.to_s
       FileUtils.mkdir_p(projpath)
-      Xcodeproj.write_plist(to_plist, File.join(projpath, 'project.pbxproj'))
+      file = File.join(projpath, 'project.pbxproj')
+      Xcodeproj.write_plist(to_hash, file)
+      fix_encoding(file)
+    end
+
+    # Simple workaround to escape characters which are outside of ASCII
+    # character-encoding. Relies on the fact that there are no XML characters
+    # which would need to be escaped.
+    #
+    # @note   This is necessary because Xcode (4.6 currently) uses the MacRoman
+    #         encoding unless the `// !$*UTF8*$!` magic comment is present. It
+    #         is not possible to serialize a plist using the NeXTSTEP format
+    #         without access to the private classes of Xcode and that comment
+    #         is not compatible with the XML format. For the complete
+    #         discussion see CocoaPods/CocoaPods#926.
+    #
+    #
+    # @note   Sadly this hack is not sufficient for supporting Emoji.
+    #
+    # @param  [String, Pathname] The path of the file which needs to be fixed.
+    #
+    # @return [void]
+    #
+    def fix_encoding(file)
+      result = ''
+      File.read(file).unpack('U*').each do |codepoint|
+        if codepoint > 255
+          result << "&##{codepoint};"
+        else
+          result << codepoint.chr
+        end
+      end
+      File.open(file, 'w') { |write_file| write_file.write(result) }
     end
 
     #-------------------------------------------------------------------------#

data/lib/xcodeproj/project/object.rb

@@ -245,7 +245,7 @@ module Xcodeproj
 
           unless object_plist.empty?
             raise "[!] Xcodeproj doesn't know about the following attributes " \
-                  "#{object_plist} for the '#{isa}' isa.\n" \
+                  "#{object_plist.inspect} for the '#{isa}' isa.\n" \
                   "Please file an issue: https://github.com/CocoaPods/Xcodeproj/issues/new"
           end
         end
@@ -286,11 +286,17 @@ module Xcodeproj
                 "Please file an issue: https://github.com/CocoaPods/Xcodeproj/issues/new"
         end
 
+        # Returns a cascade representation of the object with UUIDs.
+        #
+        # @return [Hash] a hash representation of the project.
+        #
+        # @visibility public
+        #
         # @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
         #       array.
         #
-        def to_plist
+        def to_hash
           plist = {}
           plist['isa'] = isa
 
@@ -311,12 +317,11 @@ module Xcodeproj
 
           references_by_keys_attributes.each do |attrb|
             list = attrb.get_value(self)
-            plist[attrb.plist_name] = list.map { |dictionary| dictionary.to_plist }
+            plist[attrb.plist_name] = list.map { |dictionary| dictionary.to_hash }
           end
 
           plist
         end
-        alias :to_hash :to_plist
 
         # Returns a cascade representation of the object without UUIDs.
         #
@@ -378,7 +383,7 @@ module Xcodeproj
         # @!group Object methods
 
         def ==(other)
-          other.is_a?(AbstractObject) && self.to_plist == other.to_plist
+          other.is_a?(AbstractObject) && self.to_hash == other.to_hash
         end
 
         def <=>(other)

data/lib/xcodeproj/project/object_dictionary.rb

@@ -108,7 +108,7 @@ module Xcodeproj
       #
       # @return [Hash<String => String>]
       #
-      def to_plist
+      def to_hash
         result = {}
         each { |key, obj| result[key] = obj.uuid }
         result

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
+  prerelease: 
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -84,26 +89,28 @@ files:
 homepage: https://github.com/cocoapods/xcodeproj
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - ext
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Create and modify Xcode projects from Ruby.
 test_files: []
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: d27bcb437368807f65a764df534ed795799a8d8c
-  data.tar.gz: 869df663efbe0382d011b29b76c896966cf62346
-SHA512:
-  metadata.gz: bc75e39c69d54f041dfc67c90aa1815157770a80ab1de2e38f36eb7110381eb0602c9609254549e4f955b3fe311497c60dd2a4898d825eddece42adbb32dfd1c
-  data.tar.gz: 8ac71b067eeb0eaa2132b489d299dd2b84052c65d0a1436f58d66168ad07844118a1a3481cd6f892004b8fe8f86aa9fb42939b881287ad64adbde27b733c6a1f