xcodeproj 0.26.2 → 0.26.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f58263d9fc69394301cbdc6fa9584511556d934
-  data.tar.gz: 151af3ef28dead3309b7812046e134c678b2b601
+  metadata.gz: b3ffe9ba21a5d156f491061b65e4a600ada8c653
+  data.tar.gz: b4327d4cdbbd7036dcd891c478f850ac19fdd8ea
 SHA512:
-  metadata.gz: 85241ebe570205c883765c3b13b0871cd03c2246150990649a0e4c7a90cd9e4596ed5708b08df62fbc92ed2dc9748a09d7080272e7effbb9c19ca66a17e4c454
-  data.tar.gz: adf59d7e4cf162c0965f6c6c92398261ddbda976dfb8adc61b29e2bdf3ef615ea65b5e3877e8a24fac657157c051aa6aa6799a867f22a42cb32201665dc07656
+  metadata.gz: 86aa2035f0857282fa84bc0bc13827d4523ce0724f25b4f31883c693e8724478555d85404d437de96ae54efae2720c20724b3c5e8685a7eaf60fafd8f422c1c7
+  data.tar.gz: 0f5707dee287885c37cb5fbafe17ae3832f4556a645e8b354486ab1f9b48976047511a323c77eff50aac3154cec536ed167510167397e0725a27972470351820

data/lib/xcodeproj/command/config_dump.rb

@@ -23,17 +23,15 @@ module Xcodeproj
 
       def initialize(argv)
         self.xcodeproj_path = argv.shift_argument
-
         @output_path  = Pathname(argv.shift_argument || '.')
-        unless @output_path.directory?
-          raise Informative, 'The output path must be a directory.'
-        end
 
-        super unless argv.empty?
+        super
       end
 
       def validate!
         super
+
+        raise Informative, 'The output path must be a directory.' unless @output_path.directory?
         open_project!
       end
 

data/lib/xcodeproj/gem_version.rb

@@ -1,5 +1,5 @@
 module Xcodeproj
   # The version of the xcodeproj gem.
   #
-  VERSION = '0.26.2' unless defined? Xcodeproj::VERSION
+  VERSION = '0.26.3' unless defined? Xcodeproj::VERSION
 end

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

@@ -47,7 +47,9 @@ module Xcodeproj
           #
           def hierarchy_path(object)
             unless main_group?(object)
-              "#{parent(object).hierarchy_path}/#{object.display_name}"
+              parent = parent(object)
+              parent = parent.hierarchy_path if parent.respond_to?(:hierarchy_path)
+              "#{parent}/#{object.display_name}"
             end
           end
 

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

@@ -89,6 +89,7 @@ module Xcodeproj
         # @return [Symbol] the name of the platform of the target.
         #
         def platform_name
+          return unless sdk
           if sdk.include? 'iphoneos'
             :ios
           elsif sdk.include? 'macosx'
@@ -101,9 +102,8 @@ module Xcodeproj
         # @return [String] the version of the SDK.
         #
         def sdk_version
-          if sdk
-            sdk.scan(/[0-9.]+/).first
-          end
+          return unless sdk
+          sdk.scan(/[0-9.]+/).first
         end
 
         # @return [String] the deployment target of the target according to its

data/lib/xcodeproj/project/uuid_generator.rb

@@ -21,7 +21,7 @@ module Xcodeproj
 
       def verify_no_duplicates!(all_objects)
         duplicates = all_objects - @new_objects_by_uuid.values
-        raise "[Xcodeproj] Generated duplicate UUIDs:\n\n" <<
+        UserInterface.warn "[Xcodeproj] Generated duplicate UUIDs:\n\n" <<
           duplicates.map { |d| "#{d.isa} -- #{@paths_by_object[d]}" }.join("\n") unless duplicates.empty?
       end
 
@@ -76,10 +76,12 @@ module Xcodeproj
 
       def path_component_for_object(object)
         hash = object.to_tree_hash
-        tree_hash_to_path(hash)
+        component = tree_hash_to_path(hash)
+        component << object.hierarchy_path.to_s if object.respond_to?(:hierarchy_path)
+        component
       end
 
-      def tree_hash_to_path(object, depth = 3)
+      def tree_hash_to_path(object, depth = 4)
         return '|' if depth.zero?
         case object
         when Hash
@@ -90,10 +92,8 @@ module Xcodeproj
           object.map do |value|
             tree_hash_to_path(value, depth - 1)
           end.join(',')
-        when String
-          object
         else
-          raise "[Xcodeproj] Unrecognized object `#{hash}` in #tree_hash_to_path"
+          object.to_s
         end
       end
     end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.26.3
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-18 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
 description: Xcodeproj lets you create and modify Xcode projects from Ruby. Script
@@ -115,12 +115,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []