cocoapods 0.22.1 → 0.22.2

data/CHANGELOG.md

@@ -2,6 +2,35 @@
 
 To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
 
+
+## 0.22.2
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.22.1...0.22.2)
+• [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.22.1...0.22.2)
+• [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.8.0...0.8.1)
+
+###### Enhancements
+
+* The build settings of the Pods project and of its target have been updated to
+  be in line with the new defaults of the future versions of Xcode.
+
+###### Bug fixes
+
+* Specifications defining build setting with the `[*]` syntax are now properly
+  handled.
+  [#1171](https://github.com/CocoaPods/CocoaPods/issues/1171)
+
+* The name of the files references are now properly set fixing a minor
+  regression introduced by CocoaPods 0.22.1 and matching more closely Xcode
+  behaviour.
+
+* The validator now builds the Pods target instead of the first target actually
+  performing the validation.
+
+* Build settings defined through the `xcconfig` attribute of a `podspec` are now
+  stripped of duplicate values when merged in an aggregate target.
+  [#1189](https://github.com/CocoaPods/CocoaPods/issues/1189)
+
+
 ## 0.22.1
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.22.0...0.22.1)
 • [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.22.0...0.22.1)
@@ -26,7 +55,8 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
   [#850](https://github.com/CocoaPods/CocoaPods/issues/850)
 
 * Added the `pod lib lint` subcommand which allows to lint the Pod stored
-  in the working directory (a pod spec in the root is needed).
+  in the working directory (a pod spec in the root is needed). This subcommand
+  is equivalent to the deprecated `pod spec lint --local`.
   [#850](https://github.com/CocoaPods/CocoaPods/issues/850)
 
 * The dependencies of the targets of the Pods project are now made explicit.

data/lib/cocoapods/gem_version.rb

@@ -1,6 +1,6 @@
 module Pod
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.22.1' unless defined? Pod::VERSION
+  VERSION = '0.22.2' unless defined? Pod::VERSION
 end
 

data/lib/cocoapods/generator/xcconfig.rb

@@ -10,13 +10,17 @@ module Pod
       # @return [Target] the target represented by this xcconfig.
       #
       attr_reader :target
-      attr_reader :sandbox
 
       # @param  [Target] target @see target
       #
       def initialize(target)
         @target = target
-        @sandbox = target.sandbox
+      end
+
+      # @return [Sandbox] the sandbox of this target.
+      #
+      def sandbox
+        target.sandbox
       end
 
       # @return [Xcodeproj::Config] The generated xcconfig.

data/lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb

@@ -15,27 +15,19 @@ module Pod
       # @return [Xcodeproj::Config]
       #
       def generate
-        config = {
-          'OTHER_LDFLAGS'                    => default_ld_flags,
-          'HEADER_SEARCH_PATHS'              => quote(sandbox.public_headers.search_paths),
-          'PODS_ROOT'                        => target.relative_pods_root,
-          'GCC_PREPROCESSOR_DEFINITIONS'     => '$(inherited) COCOAPODS=1',
-        }
+        @xcconfig = Xcodeproj::Config.new({
+          'OTHER_LDFLAGS'                => default_ld_flags,
+          'HEADER_SEARCH_PATHS'          => quote(sandbox.public_headers.search_paths),
+          'PODS_ROOT'                    => target.relative_pods_root,
+          'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
+        })
 
         target.pod_targets.each do |pod_target|
-          xcconfig = Xcodeproj::Config.new
           pod_target.spec_consumers.each do |consumer|
-            add_spec_build_settings_to_xcconfig(consumer, xcconfig)
-          end
-
-          xcconfig.to_hash.each do |k, v|
-            prefixed_key = pod_target.xcconfig_prefix + k
-            config[k] = "#{config[k]} ${#{prefixed_key}}"
+            add_spec_build_settings_to_xcconfig(consumer, @xcconfig)
           end
         end
 
-        @xcconfig = Xcodeproj::Config.new(config)
-        @xcconfig.includes = target.pod_targets.map(&:name)
         @xcconfig
       end
 

data/lib/cocoapods/generator/xcconfig/private_pod_xcconfig.rb

@@ -9,6 +9,19 @@ module Pod
     #
     class PrivatePodXCConfig < XCConfig
 
+      # @return [Xcodeproj::Config] The public xcconfig which this one will
+      #         use.
+      #
+      attr_reader :public_xcconfig
+
+      # @param  [Target] target @see target
+      # @param  [Xcodeproj::Config] public_xcconfig @see public_xcconfig
+      #
+      def initialize(target, public_xcconfig)
+        super(target)
+        @public_xcconfig = public_xcconfig
+      end
+
       # Generates the xcconfig.
       #
       # @return [Xcodeproj::Config]
@@ -22,19 +35,57 @@ module Pod
           # 'USE_HEADERMAP'                => 'NO'
         }
 
-        xcconfig = Xcodeproj::Config.new
-        target.spec_consumers.each do |consumer|
-          add_spec_build_settings_to_xcconfig(consumer, xcconfig)
-        end
+        xcconfig_hash = add_xcconfig_namespaced_keys(public_xcconfig.to_hash, config, target.xcconfig_prefix)
+        @xcconfig = Xcodeproj::Config.new(xcconfig_hash)
+        @xcconfig.includes = [target.name]
+        @xcconfig
+      end
+
+      private
+
+      #-----------------------------------------------------------------------#
 
-        xcconfig.to_hash.each do |k, v|
-          prefixed_key = target.xcconfig_prefix + k
-          config[k] = "#{config[k]} ${#{prefixed_key}}"
+      # !@group Private Helpers
+
+      # Returns the hash representation of an xcconfig which inherit from the
+      # namespaced keys of a given one.
+      #
+      # @param  [Hash] source_config
+      #         The xcconfig whose keys need to be inherited.
+      #
+      # @param  [Hash] destination_config
+      #         The config which should inherit the source config keys.
+      #
+      # @return [Hash] The inheriting xcconfig.
+      #
+      def add_xcconfig_namespaced_keys(source_config, destination_config, prefix)
+        result = destination_config.dup
+        source_config.each do |key, value|
+          prefixed_key = prefix + conditional_less_key(key)
+          current_value = destination_config[key]
+          if current_value
+            result[key] = "#{current_value} ${#{prefixed_key}}"
+          else
+            result[key] = "${#{prefixed_key}}"
+          end
         end
+        result
+      end
 
-        @xcconfig = Xcodeproj::Config.new(config)
-        @xcconfig.includes = [target.name]
-        @xcconfig
+      # Strips the [*]-syntax from the given xcconfig key.
+      #
+      # @param  [String] key
+      #         The key to strip.
+      #
+      # @return [String] The stripped key.
+      #
+      def conditional_less_key(key)
+        brackets_index = key.index('[')
+        if brackets_index
+          key[0...brackets_index]
+        else
+          key
+        end
       end
 
       #-----------------------------------------------------------------------#

data/lib/cocoapods/installer.rb

@@ -356,21 +356,14 @@ module Pod
     #
     def add_dependency(dependent_target, dependency_target)
       container_proxy = pods_project.new(Xcodeproj::Project::PBXContainerItemProxy)
-      # container_proxy.container_portal = '224D2C1BCDE44D8F9B674AD5'
+      container_proxy.container_portal = pods_project.root_object.uuid
       container_proxy.proxy_type = '1'
-      # container_proxy.remote_global_id_string = 'F8D3306CA0564CA3861B2D4E'
-      # container_proxy.remote_info = 'Pods-AFHTTPRequestOperationLogger'
-
-
-      # reference_proxy = pods_project.new(Xcodeproj::Project::PBXReferenceProxy)
-      # reference_proxy.path =
-      # reference_proxy.file_type =
-      # reference_proxy.remote_ref = container_proxy
-      # reference_proxy.source_tree = BUILT_PRODUCTS_DIR
+      container_proxy.remote_global_id_string = dependency_target.target.uuid
+      container_proxy.remote_info = dependency_target.target.name
 
       dependency = pods_project.new(Xcodeproj::Project::PBXTargetDependency)
       dependency.target = dependency_target.target
-      # dependency.targetProxy = container_proxy
+      dependency.targetProxy = container_proxy
 
       dependent_target.target.dependencies << dependency
     end

data/lib/cocoapods/installer/target_installer/pod_target_installer.rb

@@ -55,16 +55,16 @@ module Pod
       #
       def create_xcconfig_file
         path = library.xcconfig_path
+        public_gen = Generator::PublicPodXCConfig.new(library)
         UI.message "- Generating public xcconfig file at #{UI.path(path)}" do
-          gen = Generator::PublicPodXCConfig.new(library)
-          gen.save_as(path)
+          public_gen.save_as(path)
           add_file_to_support_group(path)
         end
 
         path = library.xcconfig_private_path
+        private_gen = Generator::PrivatePodXCConfig.new(library, public_gen.xcconfig)
         UI.message "- Generating private xcconfig file at #{UI.path(path)}" do
-          gen = Generator::PrivatePodXCConfig.new(library)
-          gen.save_as(path)
+          private_gen.save_as(path)
           xcconfig_file_ref = add_file_to_support_group(path)
 
           target.build_configurations.each do |c|

data/lib/cocoapods/project.rb

@@ -187,8 +187,9 @@ module Pod
     #
     def add_podfile(podfile_path)
       podfile_path = Pathname.new(podfile_path)
-      podfile_ref  = new_file(relativize(podfile_path))
+      podfile_ref = new_file(relativize(podfile_path))
       podfile_ref.xc_language_specification_identifier = 'xcode.lang.ruby'
+      podfile_ref.last_known_file_type = 'text'
       podfile_ref
     end
 

data/lib/cocoapods/validator.rb

@@ -211,7 +211,7 @@ module Pod
       file_accessors = installer.aggregate_targets.map do |target|
         target.pod_targets.map(&:file_accessors)
       end.flatten
-      
+
       @file_accessor = file_accessors.find { |accessor| accessor.spec.root.name == spec.root.name }
       config.silent
     end
@@ -344,7 +344,7 @@ module Pod
     #         returns its output (bot STDOUT and STDERR).
     #
     def xcodebuild
-      `xcodebuild clean build 2>&1`
+      `xcodebuild clean build -target Pods 2>&1`
     end
 
     #-------------------------------------------------------------------------#

metadata

@@ -1,171 +1,198 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: cocoapods
-version: !ruby/object:Gem::Version
-  version: 0.22.1
+version: !ruby/object:Gem::Version 
+  hash: 67
+  prerelease: 
+  segments: 
+  - 0
+  - 22
+  - 2
+  version: 0.22.2
 platform: ruby
-authors:
+authors: 
 - Eloy Duran
 - Fabio Pelosin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-07-11 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: cocoapods-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.22.1
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.22.1
-- !ruby/object:Gem::Dependency
-  name: claide
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.2
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 67
+        segments: 
+        - 0
+        - 22
+        - 2
+        version: 0.22.2
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: claide
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 3
+        - 2
         version: 0.3.2
-- !ruby/object:Gem::Dependency
-  name: cocoapods-downloader
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.1
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: cocoapods-downloader
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: xcodeproj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: xcodeproj
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: colored
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
+      - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 8
+        - 1
+        version: 0.8.1
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: colored
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: escape
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.4
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
   type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: escape
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 0
+        - 4
         version: 0.0.4
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.0
   type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 1
+        - 8
+        - 0
         version: 1.8.0
-- !ruby/object:Gem::Dependency
-  name: open4
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
   type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: open4
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.13
   type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: activesupport
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id009 !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
+  type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: bacon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
+  type: :development
+  version_requirements: *id010
 description: |-
   CocoaPods manages library dependencies for your Xcode project.
-
+  
   You specify the dependencies for your project in one easy text file. CocoaPods resolves dependencies between libraries, fetches source code for the dependencies, and creates and maintains an Xcode workspace to build your project.
-
+  
   Ultimately, the goal is to improve discoverability of, and engagement in, third party open-source libraries, by creating a more centralized ecosystem.
-email:
+email: 
 - eloy.de.enige@gmail.com
 - fabiopelosin@gmail.com
-executables:
+executables: 
 - pod
 - sandbox-pod
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/cocoapods/command/help.rb
 - lib/cocoapods/command/inter_process_communication.rb
 - lib/cocoapods/command/lib.rb
@@ -230,41 +257,52 @@ files:
 - LICENSE
 - CHANGELOG.md
 homepage: https://github.com/CocoaPods/CocoaPods
-licenses:
+licenses: 
 - MIT
-metadata: {}
-post_install_message: |2+
-
-  CHANGELOG:
-
-  ## 0.22.1
-  [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.22.0...0.22.1)
-  • [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.22.0...0.22.1)
-
-  ###### Bug fixes
-
-  * Fixed a crash related to target dependencies and subspecs.
-    [#1168](https://github.com/CocoaPods/CocoaPods/issues/1168)
-
-
+post_install_message: "\n\
+  CHANGELOG:\n\n\
+  ## 0.22.2\n\
+  [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.22.1...0.22.2)\n\
+  \xE2\x80\xA2 [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.22.1...0.22.2)\n\
+  \xE2\x80\xA2 [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.8.0...0.8.1)\n\n\
+  ###### Enhancements\n\n\
+  * The build settings of the Pods project and of its target have been updated to\n  be in line with the new defaults of the future versions of Xcode.\n\n\
+  ###### Bug fixes\n\n\
+  * Specifications defining build setting with the `[*]` syntax are now properly\n  handled.\n  [#1171](https://github.com/CocoaPods/CocoaPods/issues/1171)\n\n\
+  * The name of the files references are now properly set fixing a minor\n  regression introduced by CocoaPods 0.22.1 and matching more closely Xcode\n  behaviour.\n\n\
+  * The validator now builds the Pods target instead of the first target actually\n  performing the validation.\n\n\
+  * Build settings defined through the `xcconfig` attribute of a `podspec` are now\n  stripped of duplicate values when merged in an aggregate target.\n  [#1189](https://github.com/CocoaPods/CocoaPods/issues/1189)\n\n\n"
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      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: An Objective-C library package manager.
 test_files: []
+
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: a33164a53936d75565f0d57cbf118f7452714030
-  data.tar.gz: 5dfa0d590569a5ea0d4bbb89ec74089fdc3b315d
-SHA512:
-  metadata.gz: bb19c4f40df1b05c5aa5eef068884e94b5c9ed89433283346829375b21e2e7ee91fd36ee1ee1e6053b396cbb5fae2e332818451da26741cbc6e52633ae6bfda4
-  data.tar.gz: be0e7c7f4f883be762aa134ee01e39f425d65d4b57f47c9e5a5f0b7ec7ae57b853a4502c5dc3802ce53252af7bec4fb9cba1278cbdf660f9a94f945f84583a0c