xcodeproj 0.8.0 → 0.8.1

data/lib/xcodeproj/config.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module Xcodeproj
 
   # This class holds the data for a Xcode build settings file (xcconfig) and
@@ -136,12 +138,13 @@ module Xcodeproj
     #
     def merge!(xcconfig)
       if xcconfig.is_a? Config
-        @attributes.merge!(xcconfig.attributes) { |key, v1, v2| "#{v1} #{v2}" }
+        merge_attributes!(xcconfig.attributes)
         @libraries.merge(xcconfig.libraries)
         @frameworks.merge(xcconfig.frameworks)
         @weak_frameworks.merge(xcconfig.weak_frameworks)
       else
-        @attributes.merge!(xcconfig.to_hash) { |key, v1, v2| "#{v1} #{v2}" }
+        merge_attributes!(xcconfig.to_hash)
+
         # Parse frameworks and libraries. Then remove them from the linker
         # flags
         flags = @attributes['OTHER_LDFLAGS']
@@ -225,6 +228,21 @@ module Xcodeproj
       hash
     end
 
+    # Merges the given attributes hash while ensuring values are not duplicated.
+    #
+    # @param  [Hash] attributes
+    #         The attributes hash to merge into @attributes.
+    #
+    # @return [void]
+    #
+    def merge_attributes!(attributes)
+      @attributes.merge!(attributes) do |_, v1, v2|
+        v1, v2 = v1.strip, v2.strip
+        existing = v1.strip.shellsplit
+        existing.include?(v2) ? v1 : "#{v1} #{v2}"
+      end
+    end
+
     # Strips the comments from a line of an xcconfig string.
     #
     # @param  [String] line

data/lib/xcodeproj/constants.rb

@@ -111,6 +111,8 @@ module Xcodeproj
         'GCC_SYMBOLS_PRIVATE_EXTERN'        => 'NO',
         'GCC_OPTIMIZATION_LEVEL'            => '0',
         'COPY_PHASE_STRIP'                  => 'NO',
+        # TODO: enable after Xcode 4
+        # 'ONLY_ACTIVE_ARCH'                  => 'YES',
       }.freeze,
       :release => {
         'OTHER_CFLAGS'                      => ['-DNS_BLOCK_ASSERTIONS=1', "$(inherited)"],
@@ -144,6 +146,17 @@ module Xcodeproj
       }.freeze,
     }.freeze
 
+    # @return [Hash] The default build settings for a new project.
+    #
+    PROJECT_DEFAULT_BUILD_SETTINGS = {
+      :release => {
+      }.freeze,
+      :debug => {
+        # TODO: enable after Xcode 4
+        # 'ONLY_ACTIVE_ARCH'                  => 'YES',
+      }.freeze,
+    }.freeze
+
     # @return [Hash] The corresponding numeric value of each copy build phase
     #         destination.
     #

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

@@ -109,8 +109,12 @@ module Xcodeproj
         # Creates a new file reference with the given path and adds it to the
         # group or to an optional subpath.
         #
-        # @note The subpath is created if needed, similar to the UNIX command
-        #       `mkdir -p`
+        # @note   The subpath is created if needed, similar to the UNIX command
+        #         `mkdir -p`
+        #
+        # @note   To closely match the Xcode behaviour the name attribute of
+        #         the file reference is set only if the path of the file is not
+        #         equal to the path of the group.
         #
         # @param  [#to_s] path
         #         the file system path of the file.
@@ -128,6 +132,12 @@ module Xcodeproj
 
           target = find_subpath(sub_group_path, true)
           target.children << file
+
+          same_path_of_group = target.path == file.pathname.dirname.to_s
+          same_path_project = file.pathname.dirname.to_s == '.' && target.path.nil?
+          unless same_path_of_group || same_path_project
+            file.name = file.pathname.basename.to_s
+          end
           file
         end
 

data/lib/xcodeproj/project.rb

@@ -118,7 +118,7 @@ module Xcodeproj
         %w| Release Debug |.each do |name|
           build_configuration = new(XCBuildConfiguration)
           build_configuration.name = name
-          build_configuration.build_settings = {}
+          build_configuration.build_settings =  Constants::PROJECT_DEFAULT_BUILD_SETTINGS[name.downcase.to_sym].dup
           config_list.build_configurations << build_configuration
         end
 

data/lib/xcodeproj.rb

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

metadata

@@ -1,53 +1,62 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: xcodeproj
-version: !ruby/object:Gem::Version
-  version: 0.8.0
+version: !ruby/object:Gem::Version 
+  hash: 61
+  prerelease: 
+  segments: 
+  - 0
+  - 8
+  - 1
+  version: 0.8.1
 platform: ruby
-authors:
+authors: 
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-07-10 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 3
+        - 2
+        - 13
         version: 3.2.13
-- !ruby/object:Gem::Dependency
-  name: colored
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: colored
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-description: Xcodeproj lets you create and modify Xcode projects from Ruby. Script
-  boring management tasks or build Xcode-friendly libraries. Also includes support
-  for Xcode workspaces (.xcworkspace) and configuration files (.xcconfig).
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
+  type: :runtime
+  version_requirements: *id002
+description: Xcodeproj lets you create and modify Xcode projects from Ruby. Script boring management tasks or build Xcode-friendly libraries. Also includes support for Xcode workspaces (.xcworkspace) and configuration files (.xcconfig).
 email: eloy.de.enige@gmail.com
-executables:
+executables: 
 - xcodeproj
-extensions:
+extensions: 
 - ext/xcodeproj/extconf.rb
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/xcodeproj/command/project_diff.rb
 - lib/xcodeproj/command/show.rb
 - lib/xcodeproj/command/target_diff.rb
@@ -83,29 +92,39 @@ files:
 - LICENSE
 - bin/xcodeproj
 homepage: https://github.com/cocoapods/xcodeproj
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - ext
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.24
 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: 97d8e4a22727dedcf6fdb5519a3e6fd750f460cd
-  data.tar.gz: 58f5c265c6296a779af208542a4b653a1d1b2a5e
-SHA512:
-  metadata.gz: 7413a13df962717a8563f8e5c5fd1247d159afd52cb8ae96e268f93a74e1baf22e0250741f7434c8619181ff4263aed1724139d642fe70c171990fcf7ad6e732
-  data.tar.gz: 8eb8612c99b268da6da7aab894719b1feabdae35d647a970cf67b52df74dfa3f3bcc611716df54416af0fd272a64609a3a407a3f7e889d3fbf59da50b7c7ba72