cocoapods 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a84359c5124c149ebe91ff9dfc1c13365810c69f
-  data.tar.gz: c6603183ff3a4ff61f66adf32555d2eb031d4d0f
+  metadata.gz: 715b8dbbcd30e102cab744b29a1c7d2de026fdf5
+  data.tar.gz: f047dae069b1bc0cf5e8112f829e1e50b9f0e957
 SHA512:
-  metadata.gz: e94d2d8af92dc3cde69a47ad25243848c55d5a5f5bd37d30dd75a302a1c6952110b8a4bb504cefba6662893f44a5633bc44a7c45a42c68e171e0fa1ce8e2a16c
-  data.tar.gz: e4b4ff2b5023866af419cf77ddef26fef893b5cdc4652d112d4903d98dee98b532275d49ea4207cfb3284eab5e149eaa41b6d801bad2a806d5b004a15dac834f
+  metadata.gz: b07a220e098bd9f7a9f8a73b672dacdbef5ea867602ba5fb234c02e7ae1b9b03eb25358c0fed78c8c2691fe49b4b155c788fcb62237758e7773d81f1584b65e8
+  data.tar.gz: eb7e3c4cb5a1bd97f0f39016ed5241f14743dec70fa5a6bcbeb8748a63094e3ef02a22d7eb1a94750a9f4ced3ee279ef3a0bc9854b8512fb53e6bae038904d56

data/CHANGELOG.md

@@ -4,8 +4,79 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 ## Master
 
+
+## 0.24.0
+
+###### Enhancements
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.22.3...0.23.0.rc1)
+• [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.22.3...0.23.0.rc1)
+• [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.8.1...0.9.0)
+• [cocoapods-downloader](https://github.com/CocoaPods/cocoapods-downloader/compare/0.1.1...0.1.2)
+
+
+###### Enhancements
+
+* Added `pod init` command which generates a Podfile according to the
+  targets of the project stored in the working directory and to the templates
+  stored in the `~/.cocoapods/templates` folder. Tow templates are supported: 
+    - the `Podfile.default` template for regular targets.
+    - and the `Podfile.test` template for test targets.  
+  
+  [Ian Ynda-Hummel](https://github.com/ianyh)
+  [#1106](https://github.com/CocoaPods/CocoaPods/issues/1106)  
+  [#1045](https://github.com/CocoaPods/CocoaPods/issues/1045)  
+
+* CocoaPods will now leverage the [xcproj](https://github.com/0xced/xcproj)
+  command line tool if available in the path of the user to touch saved
+  projects. This will result in projects being serialized in the exact format
+  used by Xcode eliminating merge conflicts and other related issues. To learn
+  more about how to install xcproj see its
+  [readme](https://github.com/0xced/xcproj).  
+  [Cédric Luthi](https://github.com/0xced)  
+  [#1275](https://github.com/CocoaPods/CocoaPods/issues/1275)  
+  
+* Rationalized and cleaned up Pods project group structure and path specification.
+
+* Create all necessary build configurations for *Pods.xcodeproj* at the project level. If the user’s project has more than just *Debug* and *Release* build configurations, they may be explicitly specified in the Podfile:  
+`xcodeproj 'MyApp', 'App Store' => :release, 'Debug' => :debug, 'Release' => :release`  
+  If build configurations aren’t specified in the Podfile then they will be automatically picked from the user’s project in *Release* mode.  
+  These changes will ensure that the `libPods.a` static library is not stripped for all configurations, as explained in [#1217](https://github.com/CocoaPods/CocoaPods/pull/1217).  
+  [Cédric Luthi](https://github.com/0xced)  
+  [#1294](https://github.com/CocoaPods/CocoaPods/issues/1294)
+
+* Added basic support for Bazaar repositories.  
+  [Fred McCann](https://github.com/fmccann)  
+  [cocoapods-downloader#4](https://github.com/CocoaPods/cocoapods-downloader/pull/4)
+
+###### Bug Fixes
+
+* Fixed crash in `pod spec cat`.
+
+* Use the `TARGET_BUILD_DIR` environment variable for installing resource bundles.  
+  [Cédric Luthi](https://github.com/0xced)  
+  [#1268](https://github.com/CocoaPods/CocoaPods/issues/1268)  
+
+* CoreData versioned models are now properly handled respecting the contents of
+  the `.xccurrentversion` file.  
+  [#1288](https://github.com/CocoaPods/CocoaPods/issues/1288),
+  [Xcodeproj#83](https://github.com/CocoaPods/Xcodeproj/pull/83)  
+  [Ashton-W](https://github.com/Ashton-W)
+
+* OS X frameworks are now copied to the Resources folder using rsync to
+  properly overwrite existing files.  
+  [Nikolaj Schumacher](https://github.com/nschum)
+  [#1063](https://github.com/CocoaPods/CocoaPods/issues/1063)
+
+* User defined build configurations are now added to the resource bundle
+  targets.  
+  [#1309](https://github.com/CocoaPods/CocoaPods/issues/1309),
+
+
 ## 0.23.0
 
+
+## 0.23.0.rc1
+
 ###### Enhancements
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.22.3...0.23.0.rc1)
 • [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.22.3...0.23.0.rc1)

data/LICENSE

@@ -1,3 +1,5 @@
+This project is licensed under the MIT license.
+
 Copyright (c) 2011 - 2012 Eloy Durán <eloy.de.enige@gmail.com>
 Copyright (c)        2012 Fabio Pelosin <fabiopelosin@gmail.com>
 

data/lib/cocoapods.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
-
-autoload :Xcodeproj, 'xcodeproj'
+require 'xcodeproj'
 
 module Pod
   require 'pathname'

data/lib/cocoapods/command.rb

@@ -20,6 +20,7 @@ module Pod
     require 'cocoapods/command/search'
     require 'cocoapods/command/setup'
     require 'cocoapods/command/spec'
+    require 'cocoapods/command/init'
 
     self.abstract_command = true
     self.default_subcommand = 'install'

data/lib/cocoapods/command/init.rb

@@ -0,0 +1,90 @@
+require 'xcodeproj'
+require 'active_support/core_ext/string/strip'
+
+module Pod
+  class Command
+    class Init < Command
+
+      self.summary = 'Generate a Podfile for the current directory.'
+      self.description = <<-DESC
+        Creates a Podfile for the current directory if none currently exists. If
+        an Xcode project file is specified or if there is only a single project
+        file in the current directory, targets will be automatically generated
+        based on targets defined in the project.
+
+        It is possible to specify a list of dependencies which will be used by
+        the template in the `Podfile.default` (normal targets) `Podfile.test`
+        (test targets) files which should be stored in the
+        `~/.cocoapods/templates` folder.
+      DESC
+      self.arguments = '[XCODEPROJ]'
+
+      def initialize(argv)
+        @podfile_path = Pathname.pwd + "Podfile"
+        @project_path = argv.shift_argument
+        @project_paths = Pathname.pwd.children.select { |pn| pn.extname == '.xcodeproj' }
+        super
+      end
+
+      def validate!
+        super
+        raise Informative, "Existing Podfile found in directory" unless config.podfile.nil?
+        if @project_path
+          help! "Xcode project at #{@project_path} does not exist" unless File.exist? @project_path
+        else
+          raise Informative, "No xcode project found, please specify one" unless @project_paths.length > 0
+          raise Informative, "Multiple xcode projects found, please specify one" unless @project_paths.length == 1
+          @project_path = @project_paths.first
+        end
+        @xcode_project = Xcodeproj::Project.open(@project_path)
+      end
+
+      def run
+        @podfile_path.open('w') { |f| f << podfile_template(@xcode_project) }
+      end
+
+      private
+
+      # @param  [Xcodeproj::Project] project
+      #         The xcode project to generate a podfile for.
+      #
+      # @return [String] the text of the Podfile for the provided project
+      #
+      def podfile_template(project)
+        podfile = <<-PLATFORM.strip_heredoc
+          # Uncomment this line to define a global platform for your project
+          # platform :ios, "6.0"
+        PLATFORM
+        for target in project.targets
+          podfile << target_module(target)
+        end
+        podfile << "\n"
+      end
+
+      # @param  [Xcodeproj::PBXTarget] target
+      #         A target to generate a Podfile target module for.
+      #
+      # @return [String] the text for the target module
+      #
+      def target_module(target)
+        target_module = "\ntarget \"#{target.name}\" do\n"
+
+        if target.name =~ /tests?/i
+          target_module << template_contents(config.default_test_podfile_path)
+        else
+          target_module << template_contents(config.default_podfile_path)
+        end
+        target_module << "\nend\n"
+      end
+
+
+      def template_contents(path)
+        if path.exist?
+          path.read.chomp.lines.map{ |line| "  #{line}" }.join("\n")
+        else
+          String.new
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/command/setup.rb

@@ -6,7 +6,7 @@ module Pod
       self.summary = 'Setup the CocoaPods environment'
 
       self.description = <<-DESC
-        Creates a directory at `~/.cocoapods` which will hold your spec-repos.
+        Creates a directory at `~/.cocoapods/repos` which will hold your spec-repos.
         This is where it will create a clone of the public `master` spec-repo from:
 
             https://github.com/CocoaPods/Specs

data/lib/cocoapods/command/spec.rb

@@ -304,7 +304,7 @@ module Pod
       # @return [Pathname] the absolute path of the given spec and source
       #
       def pathname_from_spec(spec, source)
-        Pathname.new("~/.cocoapods/#{ source }/#{ spec.name }/#{ spec.version }/#{ spec.name }.podspec").expand_path
+        config.repos_dir + "#{source}/#{spec.name}/#{spec.version}/#{spec.name}.podspec"
       end
 
       # @return [String] of spec paths one on each line

data/lib/cocoapods/config.rb

@@ -147,6 +147,12 @@ module Pod
 
     attr_writer :repos_dir
 
+    # @return [Pathname] the directory where the CocoaPods templates are stored.
+    #
+    def templates_dir
+      @templates_dir ||= Pathname.new(ENV['CP_TEMPLATES_DIR'] || "~/.cocoapods/templates").expand_path
+    end
+
     # @return [Pathname] the root of the CocoaPods installation where the
     #         Podfile is located.
     #
@@ -223,6 +229,26 @@ module Pod
       @lockfile_path ||= installation_root + 'Podfile.lock'
     end
 
+    # Returns the path of the default Podfile pods.
+    #
+    # @note The file is expected to be named Podfile.default
+    #
+    # @return [Pathname]
+    #
+    def default_podfile_path
+      @default_podfile_path ||= templates_dir + "Podfile.default"
+    end
+
+    # Returns the path of the default Podfile test pods.
+    #
+    # @note The file is expected to be named Podfile.test
+    #
+    # @return [Pathname]
+    #
+    def default_test_podfile_path
+      @default_test_podfile_path ||= templates_dir + "Podfile.test"
+    end
+
     # @return [Pathname] The file to use a cache of the statistics provider.
     #
     def statistics_cache_file

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -98,8 +98,8 @@ install_resource()
     *.framework)
       echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
       mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
-      echo "cp -fpR ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
-      cp -fpR "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
       ;;
     *.xcdatamodel)
       echo "xcrun momc \\"${PODS_ROOT}/$1\\" \\"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\\""

data/lib/cocoapods/installer.rb

@@ -285,10 +285,23 @@ module Pod
     #
     def prepare_pods_project
       UI.message "- Creating Pods project" do
-        @pods_project = Pod::Project.new(sandbox)
+        @pods_project = Pod::Project.new(sandbox.project_path)
+
+        analysis_result.all_user_build_configurations.each do |name, type|
+          @pods_project.add_build_configuration(name, type)
+        end
+
+        pod_names = pod_targets.map(&:pod_name).uniq
+        pod_names.each do |pod_name|
+          path = sandbox.pod_dir(pod_name)
+          local = sandbox.local?(pod_name)
+          @pods_project.add_pod_group(pod_name, path, local)
+        end
+
         if config.podfile_path
           @pods_project.add_podfile(config.podfile_path)
         end
+
         sandbox.project = @pods_project
         platforms = aggregate_targets.map(&:platform)
         osx_deployment_target = platforms.select { |p| p.name == :osx }.map(&:deployment_target).min
@@ -331,6 +344,16 @@ module Pod
           target_installer = AggregateTargetInstaller.new(sandbox, target)
           target_installer.install!
         end
+
+        # TODO
+        # Move and add specs
+        pod_targets.sort_by(&:name).each do |pod_target|
+          pod_target.file_accessors.each do |file_accessor|
+            file_accessor.spec_consumer.frameworks.each do |framework|
+              ref = pods_project.add_system_framework(framework, pod_target.target)
+            end
+          end
+        end
       end
     end
 
@@ -360,10 +383,9 @@ module Pod
     #
     def link_aggregate_target
       aggregate_targets.each do |aggregate_target|
-        native_target = pods_project.targets.select { |t| t.name == aggregate_target.name }.first
-        products = pods_project.products_group
+        native_target = aggregate_target.target
         aggregate_target.pod_targets.each do |pod_target|
-          product = products.files.select { |f| f.path == pod_target.product_name }.first
+          product = pod_target.target.product_reference
           native_target.frameworks_build_phase.add_file_reference(product)
         end
       end
@@ -375,9 +397,10 @@ module Pod
     #
     def write_pod_project
       UI.message "- Writing Xcode project file to #{UI.path sandbox.project_path}" do
-        pods_project.main_group.sort_by_type!
-        pods_project['Frameworks'].sort_by_type!
-        pods_project.save_as(sandbox.project_path)
+        pods_project.pods.remove_from_project if pods_project.pods.empty?
+        pods_project.development_pods.remove_from_project if pods_project.development_pods.empty?
+        pods_project.main_group.recursively_sort_by_type
+        pods_project.save
       end
     end
 

data/lib/cocoapods/installer/analyzer.rb

@@ -169,7 +169,7 @@ module Pod
 
           if config.integrate_targets?
             project_path = compute_user_project_path(target_definition)
-            user_project = Xcodeproj::Project.new(project_path)
+            user_project = Xcodeproj::Project.open(project_path)
             native_targets = compute_user_project_targets(target_definition, user_project)
 
             target.user_project_path = project_path
@@ -449,7 +449,7 @@ module Pod
         podfile.target_definition_list.each do |target_definition|
           if config.integrate_targets?
             project_path = compute_user_project_path(target_definition)
-            user_project = Xcodeproj::Project.new(project_path)
+            user_project = Xcodeproj::Project.open(project_path)
             targets = compute_user_project_targets(target_definition, user_project)
             platform = compute_platform_for_target_definition(target_definition, targets)
           else
@@ -488,6 +488,16 @@ module Pod
         #
         attr_accessor :targets
 
+        # @return [Hash{String=>Symbol}] A hash representing all the user build
+        #         configurations across all integration targets. Each key
+        #         corresponds to the name of a configuration and its value to
+        #         its type (`:debug` or `:release`).
+        #
+        def all_user_build_configurations
+          targets.inject({}) do |result, target|
+            result.merge(target.user_build_configurations)
+          end
+        end
       end
 
       #-----------------------------------------------------------------------#

data/lib/cocoapods/installer/file_references_installer.rb

@@ -65,15 +65,11 @@ module Pod
       # @note   The source files are grouped by Pod and in turn by subspec
       #         (recursively).
       #
-      # @note   Pods are generally added to the `Pods` group, however, if they
-      #         have a local source they are added to the
-      #         `Local Pods` group.
-      #
       # @return [void]
       #
       def add_source_files_references
         UI.message "- Adding source files to Pods project" do
-          add_file_acessors_paths_to_pods_group(:source_files, :source_files)
+          add_file_accessors_paths_to_pods_group(:source_files, :source_files)
         end
       end
 
@@ -83,7 +79,7 @@ module Pod
       #
       def add_frameworks_bundles
         UI.message "- Adding frameworks to Pods project" do
-          add_file_acessors_paths_to_pods_group(:vendored_frameworks, :frameworks_and_libraries)
+          add_file_accessors_paths_to_pods_group(:vendored_frameworks, :frameworks_and_libraries)
         end
       end
 
@@ -93,7 +89,7 @@ module Pod
       #
       def add_vendored_libraries
         UI.message "- Adding frameworks to Pods project" do
-          add_file_acessors_paths_to_pods_group(:vendored_libraries, :frameworks_and_libraries)
+          add_file_accessors_paths_to_pods_group(:vendored_libraries, :frameworks_and_libraries)
         end
       end
 
@@ -106,8 +102,8 @@ module Pod
       #
       def add_resources
         UI.message "- Adding resources to Pods project" do
-          add_file_acessors_paths_to_pods_group(:resources, :resources)
-          add_file_acessors_paths_to_pods_group(:resource_bundle_files, :resources)
+          add_file_accessors_paths_to_pods_group(:resources, :resources)
+          add_file_accessors_paths_to_pods_group(:resource_bundle_files, :resources)
         end
       end
 
@@ -160,7 +156,7 @@ module Pod
       #
       # @return [void]
       #
-      def add_file_acessors_paths_to_pods_group(file_accessor_key, group_key)
+      def add_file_accessors_paths_to_pods_group(file_accessor_key, group_key)
         file_accessors.each do |file_accessor|
           paths = file_accessor.send(file_accessor_key)
           paths.each do |path|

data/lib/cocoapods/installer/target_installer.rb

@@ -52,13 +52,7 @@ module Pod
         @target.build_settings('Release').merge!(settings)
 
         library.user_build_configurations.each do |bc_name, type|
-          unless @target.build_configurations.map(&:name).include?(bc_name)
-            build_config = project.new(Xcodeproj::Project::XCBuildConfiguration)
-            build_config.name = bc_name
-            settings = @target.build_settings(type.to_s.capitalize).dup
-            build_config.build_settings = settings
-            target.build_configurations << build_config
-          end
+          @target.add_build_configuration(bc_name, type)
         end
 
         library.target = @target
@@ -126,8 +120,7 @@ module Pod
       # @return [PBXFileReference] the file reference of the added file.
       #
       def add_file_to_support_group(path)
-        relative_path = path.relative_path_from(sandbox.root)
-        support_files_group.new_file(relative_path)
+        support_files_group.new_file(path)
       end
 
       #-----------------------------------------------------------------------#

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

@@ -90,8 +90,8 @@ module Pod
         path = library.copy_resources_script_path
         UI.message "- Generating copy resources script at #{UI.path(path)}" do
           file_accessors = library.pod_targets.map(&:file_accessors).flatten
-          resource_paths = file_accessors.map { |accessor| accessor.resources.flatten.map {|res| project.relativize(res)} }.flatten
-          resource_bundles = file_accessors.map { |accessor| accessor.resource_bundles.keys.map {|name| "${BUILD_DIR}/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}/#{name}.bundle" } }.flatten
+          resource_paths = file_accessors.map { |accessor| accessor.resources.flatten.map { |res| res.relative_path_from(project.path.dirname) }}.flatten
+          resource_bundles = file_accessors.map { |accessor| accessor.resource_bundles.keys.map {|name| "${TARGET_BUILD_DIR}/#{name}.bundle" } }.flatten
           resources = []
           resources.concat(resource_paths)
           resources.concat(resource_bundles)

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

@@ -13,9 +13,10 @@ module Pod
       def install!
         UI.message "- Installing target `#{library.name}` #{library.platform}" do
           add_target
+          move_target_product_file_reference
           add_files_to_build_phases
           add_resources_bundle_targets
-          create_suport_files_group
+          # create_suport_files_group
           create_xcconfig_file
           create_prefix_header
           create_dummy_source
@@ -40,16 +41,19 @@ module Pod
             consumer = file_accessor.spec_consumer
             flags = compiler_flags_for_consumer(consumer)
             source_files = file_accessor.source_files
-            file_refs = source_files.map { |sf| project.file_reference(sf) }
+            file_refs = source_files.map { |sf| project.reference_for_path(sf) }
             target.add_file_references(file_refs, flags)
 
-            file_accessor.spec_consumer.frameworks.each do |framework|
-              project.add_system_framework(framework, target)
-            end
           end
         end
       end
 
+      def move_target_product_file_reference
+        pod_name = library.pod_name
+        group = project.group_for_spec(pod_name, :products)
+        target.product_reference.move(group)
+      end
+
       # Adds the resources of the Pods to the Pods project.
       #
       # @note   The source files are grouped by Pod and in turn by subspec
@@ -61,12 +65,16 @@ module Pod
         UI.message "- Adding resource bundles to Pods project" do
           library.file_accessors.each do |file_accessor|
             file_accessor.resource_bundles.each do |bundle_name, paths|
-              file_references = paths.map { |sf| project.file_reference(sf) }
-              group = project.group_for_spec(file_accessor.spec.name, :resources)
+              file_references = paths.map { |sf| project.reference_for_path(sf) }
+              group = project.group_for_spec(file_accessor.spec.name, :products)
               product_group = project.group_for_spec(file_accessor.spec.name, :resources)
               bundle_target = project.new_resources_bundle(bundle_name, file_accessor.spec_consumer.platform_name, product_group)
               bundle_target.add_resources(file_references)
 
+              library.user_build_configurations.each do |bc_name, type|
+                bundle_target.add_build_configuration(bc_name, type)
+              end
+
               target.add_dependency(bundle_target)
             end
           end
@@ -179,6 +187,19 @@ module Pod
         flags * " "
       end
 
+      # Adds a reference to the given file in the support group of this target.
+      #
+      # @param  [Pathname] path
+      #         The path of the file to which the reference should be added.
+      #
+      # @return [PBXFileReference] the file reference of the added file.
+      #
+      def add_file_to_support_group(path)
+        pod_name = library.pod_name
+        group = project.group_for_spec(pod_name, :support_files)
+        group.new_file(path)
+      end
+
       #-----------------------------------------------------------------------#
 
     end

data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -32,7 +32,7 @@ module Pod
             add_pods_library
             add_copy_resources_script_phase
             add_check_manifest_lock_script_phase
-            save_user_project
+            user_project.save
           end
         end
 
@@ -66,14 +66,14 @@ module Pod
         # other TargetIntegrators might have modified it.
         #
         def user_project
-          @user_project ||= Xcodeproj::Project.new(target.user_project_path)
+          @user_project ||= Xcodeproj::Project.open(target.user_project_path)
         end
 
         # Read the pods project from the disk to ensure that it is up to date as
         # other TargetIntegrators might have modified it.
         #
         def pods_project
-          @pods_project ||= Xcodeproj::Project.new(target.sandbox.project_path)
+          @pods_project ||= Xcodeproj::Project.open(target.sandbox.project_path)
         end
 
         # @return [String] a string representation suitable for debugging.
@@ -182,14 +182,6 @@ module Pod
           end
         end
 
-        # Saves the changes to the user project to the disk.
-        #
-        # @return [void]
-        #
-        def save_user_project
-          user_project.save_as(target.user_project_path)
-        end
-
         #---------------------------------------------------------------------#
 
         # @!group Private helpers.

data/lib/cocoapods/project.rb

@@ -9,230 +9,202 @@ module Pod
   #
   class Project < Xcodeproj::Project
 
-
-    # @return [Sandbox] the sandbox which returns the information about which
-    #         Pods are local.
-    #
-    attr_reader :sandbox
-
-    # @param  [Sandbox] sandbox @see #sandbox
+    # @param  [Pathname, String] path @see path
+    # @param  [Bool] skip_initialization
+    #         Wether the project should be initialized from scratch.
     #
-    def initialize(sandbox)
-      super(nil) # Recreate the project from scratch for now.
-      # TODO
-      raise unless sandbox.is_a?(Sandbox)
-      @sandbox = sandbox
-      @path = sandbox.project_path
+    def initialize(path, skip_initialization = false)
+      super(path, skip_initialization)
       @support_files_group = new_group('Targets Support Files')
-
       @refs_by_absolute_path = {}
+      @pods = new_group('Pods')
+      @development_pods = new_group('Development Pods')
     end
 
-    # @return [Pathname] the path of the xcodeproj file which stores the
-    #         project.
+    # @return [PBXGroup] The group for the support files of the aggregate
+    #         targets.
     #
-    attr_reader :path
+    attr_reader :support_files_group
 
-    # @return [Pathname] the directory where the project is stored.
+    # @return [PBXGroup] The group for the Pods.
     #
-    def root
-      @root ||= path.dirname
-    end
+    attr_reader :pods
 
-    # @return [Pathname] Returns the relative path from the project root.
+    # @return [PBXGroup] The group for Development Pods.
     #
-    # @param  [Pathname] path
-    #         The path that needs to be converted to the relative format.
+    attr_reader :development_pods
+
+
+    public
+
+    # @!group Pod Groups
+    #-------------------------------------------------------------------------#
+
+    # Creates a new group for the Pod with the given name and configures its
+    # path.
     #
-    # @note   If the two absolute paths don't share the same root directory an
-    #         extra `../` is added to the result of
-    #         {Pathname#relative_path_from}.
+    # @param  [String] pod_name
+    #         The name of the Pod.
     #
-    # @example
+    # @param  [#to_s] path
+    #         The path to the root of the Pod.
     #
-    #   path = Pathname.new('/Users/dir')
-    #   @sandbox.root #=> Pathname('/tmp/CocoaPods/Lint/Pods')
+    # @param  [Bool] development
+    #         Wether the group should be added to the Development Pods group.
     #
-    #   @sandbox.relativize(path) #=> '../../../../Users/dir'
-    #   @sandbox.relativize(path) #=> '../../../../../Users/dir'
+    # @param  [Bool] absolute
+    #         Wether the path of the group should be set as absolute.
     #
-    def relativize(path)
-      unless path.absolute?
-        raise StandardError, "[Bug] Attempt to add relative path `#{path}` to the Pods project"
-      end
+    # @return [PBXGroup] The new group.
+    #
+    def add_pod_group(pod_name, path, development = false, absolute = false)
+      raise "[BUG]" if pod_group(pod_name)
 
-      result = path.relative_path_from(root)
-      unless root.to_s.split('/')[1] == path.to_s.split('/')[1]
-        result = Pathname.new('../') + result
-      end
-      result
+      parent_group = development ? development_pods : pods
+      source_tree = absolute ? :absolute : :group
+      group = parent_group.new_group(pod_name, path, source_tree)
+      support_files_group = group.new_group(SPEC_SUBGROUPS[:support_files])
+      support_files_group.source_tree = 'SOURCE_ROOT'
+      group
     end
 
-    # @return [String] a string representation suited for debugging.
+    # @return [Array<PBXGroup>] Returns all the group of the Pods.
     #
-    def inspect
-      "#<#{self.class}> path:#{path}"
+    def pod_groups
+      pods.children.objects + development_pods.children.objects
     end
 
-    #-------------------------------------------------------------------------#
-
-    public
-
-    # @!group Groups
-
-    # @return [PBXGroup] the group where the support files for the Pod
-    #         libraries should be added.
+    # Returns the group for the Pod with the given name.
     #
-    attr_reader :support_files_group
-
-    # Returns the `Pods` group, creating it if needed.
+    # @param  [String] pod_name
+    #         The name of the Pod.
     #
-    # @return [PBXGroup] the group.
+    # @return [PBXGroup] The group.
     #
-    def pods
-      @pods ||= new_group('Pods')
+    def pod_group(pod_name)
+      pod_groups.find { |group| group.name == pod_name }
     end
 
-    # Returns the `Local Pods` group, creating it if needed. This group is used
-    # to contain locally sourced pods.
+    # @return [Hash] The names of the specification subgroups by key.
     #
-    # @return [PBXGroup] the group.
-    #
-    def local_pods
-      @local_pods ||= new_group('Local Pods')
-    end
+    SPEC_SUBGROUPS = {
+      :source_files             => 'Source Files',
+      :resources                => 'Resources',
+      :frameworks_and_libraries => 'Frameworks & Libraries',
+      :support_files            => 'Support Files',
+      :subspecs                 => 'Subspecs',
+      :products                 => 'Products',
+    }
 
-    # Returns the `Local Pods` group, creating it if needed. This group is used
-    # to contain locally sourced pods.
+    # Returns the group for the specification with the give name creating it if
+    # needed.
     #
-    # @return [PBXGroup] the group.
+    # @param [String] spec_name
+    #                 The full name of the specification.
     #
-    def resources
-      @resources ||= new_group('Resources')
-    end
-
-
-    # @return [PBXGroup] the group for the spec with the given name.
+    # @param [Symbol] subgroup_key
+    #                 The optional key of the subgroup (@see #{SPEC_SUBGROUPS})
     #
-    def group_for_spec(spec_name, type = nil)
-      local = sandbox.local?(spec_name)
-      parent_group = local ? local_pods : pods
-      spec_group = add_spec_group(spec_name, parent_group)
-      if type
-        case type
-        when :source_files then sub_group = 'Source Files'
-        when :resources then sub_group = 'Resources'
-        when :frameworks_and_libraries then sub_group = 'Frameworks & Libraries'
-        when :support_files then sub_group = 'Support Files'
-        else raise "[BUG]"
-        end
-        spec_group.find_subpath(sub_group, true)
+    # @return [PBXGroup] The group.
+    #
+    def group_for_spec(spec_name, subgroup_key = nil)
+      spec_group = spec_group(spec_name)
+      if subgroup_key
+        subgroup = SPEC_SUBGROUPS[subgroup_key]
+        raise ArgumentError, "Unrecognized subgroup `#{subgroup_key}`" unless subgroup
+        spec_group.find_subpath(subgroup, true)
       else
         spec_group
       end
     end
 
-    #-------------------------------------------------------------------------#
 
     public
 
     # @!group File references
+    #-------------------------------------------------------------------------#
 
-    # Adds a file reference for each one of the given files in the specified
-    # group, namespaced by specification unless a file reference for the given
-    # path already exits.
+    # Adds a file reference to given path as a child of the given group.
     #
-    # @note   With this set-up different subspecs might not reference the same
-    #         file (i.e. the first will win). Not sure thought if this is a
-    #         limitation or a feature.
+    # @param  [Array<Pathname,String>] absolute_path
+    #         The path of the file.
     #
-    # @param  [Array<Pathname,String>] paths
-    #         The files for which the file reference is needed.
+    # @param  [PBXGroup] group
+    #         The group for the new file reference.
     #
-    # @param  [String] spec_name
-    #         The full name of the specification.
-    #
-    # @param  [PBXGroup] parent_group
-    #         The group where the file references should be added.
+    # @return [PBXFileReference] The new file reference.
     #
-    # @return [void]
-    #
-    def add_file_references(absolute_path, spec_name, parent_group)
-      group = group_for_spec(spec_name, :source_files)
-      absolute_path.each do |file|
-        existing = file_reference(file)
-        unless existing
-          file = Pathname.new(file)
-          ref = group.new_file(relativize(file))
-          @refs_by_absolute_path[file] = ref
-        end
+    def add_file_reference(absolute_path, group)
+      unless Pathname.new(absolute_path).absolute?
+        raise ArgumentError, "Paths must be absolute #{absolute_path}"
       end
-    end
 
-    # TODO: missing customization for file reference
-    #
-    def add_file_reference(absolute_path, group)
-      ref = group.new_file(relativize(absolute_path))
-      @refs_by_absolute_path[absolute_path] = ref
+      if ref = reference_for_path(absolute_path)
+        ref
+      else
+        ref = group.new_file(absolute_path)
+        @refs_by_absolute_path[absolute_path.to_s] = ref
+      end
     end
 
-    # Returns the file reference for the given absolute file path.
+    # Returns the file reference for the given absolute path.
     #
-    # @param  [Pathname,String] absolute_path
+    # @param  [#to_s] absolute_path
     #         The absolute path of the file whose reference is needed.
     #
     # @return [PBXFileReference] The file reference.
     # @return [Nil] If no file reference could be found.
     #
-    def file_reference(absolute_path)
-      absolute_path = Pathname.new(absolute_path)
-      refs_by_absolute_path[absolute_path]
+    def reference_for_path(absolute_path)
+      unless Pathname.new(absolute_path).absolute?
+        raise ArgumentError, "Paths must be absolute #{absolute_path}"
+      end
+
+      refs_by_absolute_path[absolute_path.to_s]
     end
 
-    # Adds a file reference to the podfile.
+    # Adds a file reference to the Podfile.
     #
-    # @param  [Pathname,String] podfile_path
-    #         the path of the podfile
+    # @param  [#to_s] podfile_path
+    #         The path of the Podfile.
     #
-    # @return [PBXFileReference] the file reference.
+    # @return [PBXFileReference] The new file reference.
     #
     def add_podfile(podfile_path)
-      podfile_path = Pathname.new(podfile_path)
-      podfile_ref = new_file(relativize(podfile_path))
+      podfile_ref = new_file(podfile_path, :project)
       podfile_ref.xc_language_specification_identifier = 'xcode.lang.ruby'
       podfile_ref.last_known_file_type = 'text'
       podfile_ref
     end
 
-    #-------------------------------------------------------------------------#
 
     private
 
     # @!group Private helpers
+    #-------------------------------------------------------------------------#
 
-    # @return [Hash{Pathname => PBXFileReference}] The file references grouped
+    # @return [Hash{String => PBXFileReference}] The file references grouped
     #         by absolute path.
     #
     attr_reader :refs_by_absolute_path
 
-    # Returns a subgroup of the give group for the given spec creating it if
-    # needed.
+    # Returns the group for the given specification creating it if needed.
     #
     # @param  [String] spec_name
     #         The full name of the specification.
     #
-    # @param  [PBXGroup] root_group
-    #         The group where to add the specification. Either `Pods` or `Local
-    #         Pods`.
-    #
-    # @return [PBXGroup] the group for the spec with the given name.
-    #
-    def add_spec_group(spec_name, root_group)
-      current_group = root_group
-      group = nil
-      spec_name.split('/').each do |name|
-        group = current_group[name] || current_group.new_group(name)
-        current_group = group
+    # @return [PBXGroup] The group for the spec with the given name.
+    #
+    def spec_group(spec_name)
+      pod_name = Specification.root_name(spec_name)
+      group = pod_group(pod_name)
+      raise "[Bug] Unable to locate group for Pod named `#{pod_name}`" unless group
+      if spec_name != pod_name
+        subspecs_names = spec_name.gsub(pod_name + '/', '').split('/')
+        subspecs_names.each do |name|
+          subspecs_group = group[SPEC_SUBGROUPS[:subspecs]] || group.new_group(SPEC_SUBGROUPS[:subspecs])
+          group = subspecs_group[name] || subspecs_group.new_group(name)
+        end
       end
       group
     end

data/lib/cocoapods/sandbox.rb

@@ -67,7 +67,7 @@ module Pod
       @predownloaded_pods = []
       @head_pods = []
       @checkout_sources = {}
-      @local_pods = {}
+      @development_pods = {}
       FileUtils.mkdir_p(@root)
     end
 
@@ -152,7 +152,7 @@ module Pod
     def pod_dir(name)
       root_name = Specification.root_name(name)
       if local?(root_name)
-        Pathname.new(local_pods[root_name])
+        Pathname.new(development_pods[root_name])
       else
         # root + "Sources/#{name}"
         root + root_name
@@ -342,7 +342,7 @@ module Pod
     #
     def store_local_path(name, path)
       root_name = Specification.root_name(name)
-      local_pods[root_name] = path.to_s
+      development_pods[root_name] = path.to_s
     end
 
     # @return [Hash{String=>String}] The path of the Pods with a local source
@@ -350,7 +350,7 @@ module Pod
     #
     # @todo   Rename (e.g. `pods_with_local_path`)
     #
-    attr_reader :local_pods
+    attr_reader :development_pods
 
     # Checks if a Pod is locally sourced?
     #
@@ -361,7 +361,7 @@ module Pod
     #
     def local?(name)
       root_name = Specification.root_name(name)
-      !local_pods[root_name].nil?
+      !development_pods[root_name].nil?
     end
 
     #-------------------------------------------------------------------------#

data/lib/cocoapods/user_interface.rb

@@ -283,23 +283,41 @@ module Pod
   end
   UI = UserInterface
 
+  #---------------------------------------------------------------------------#
+
   # Redirects cocoapods-core UI.
   #
   module CoreUI
 
     class << self
 
-      # @todo enable in CocoaPods 0.17.0 release
-      #
       def puts(message)
-        # UI.puts message
+        UI.puts message
       end
 
-      # @todo enable in CocoaPods 0.17.0 release
-      #
       def warn(message)
-        # UI.warn message
+        UI.warn message
       end
     end
   end
 end
+
+  #---------------------------------------------------------------------------#
+
+module Xcodeproj
+
+  # Redirects xcodeproj UI.
+  #
+  module UserInterface
+
+    def self.puts(message)
+      ::Pod::UI.puts message
+    end
+
+    def self.warn(message)
+      ::Pod::UI.warn message
+    end
+
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -45,28 +45,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
@@ -101,42 +101,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +167,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/cocoapods/command/help.rb
+- lib/cocoapods/command/init.rb
 - lib/cocoapods/command/inter_process_communication.rb
 - lib/cocoapods/command/lib.rb
 - lib/cocoapods/command/list.rb
@@ -234,39 +235,42 @@ homepage: https://github.com/CocoaPods/CocoaPods
 licenses:
 - MIT
 metadata: {}
-post_install_message: "\nCHANGELOG:\n\n## 0.23.0\n\n###### Enhancements\n[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.22.3...0.23.0.rc1)\n•
+post_install_message: "\nCHANGELOG:\n\n## 0.24.0\n\n###### Enhancements\n[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.22.3...0.23.0.rc1)\n•
   [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.22.3...0.23.0.rc1)\n•
-  [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.8.1...0.9.0)\n• [cocoapods-downloader](https://github.com/CocoaPods/cocoapods-downloader/compare/0.1.1...0.1.2)\n\n*
-  Added `prepare_command` attribute to Specification DSL. The prepare command\n  will
-  replace the `pre_install` hook. The `post_install` hook has also been\n  deprecated.\n
-  \ [#1247](https://github.com/CocoaPods/CocoaPods/issues/1247)\n\n  The reason we
-  provided Ruby hooks at first, was because we wanted to offer\n  the option to make
-  any required configuration possible. By now, however, we\n  have a pretty good idea
-  of the use-cases and are therefore locking down the\n  freedom that was once available.
-  In turn, we’re adding attributes that can\n  replace the most common use-cases.
-  _(See the enhancements directly following\n  this entry for more info)._\n\n  The
-  second reason we need to lock this down is because this is the last\n  remaining
-  obstacle to fully serialize specifications, which we need in order\n  to move to
-  a ‘spec push’ web-service in the future.\n\n* Added `resource_bundles` attribute
-  to the Specification DSL.  \n  [#743](https://github.com/CocoaPods/CocoaPods/issues/743)\n
-  \ [#1186](https://github.com/CocoaPods/CocoaPods/issues/1186)\n\n* Added `vendored_frameworks`
-  attribute to the Specification DSL.  \n  [#809](https://github.com/CocoaPods/CocoaPods/issues/809)\n
-  \ [#1075](https://github.com/CocoaPods/CocoaPods/issues/1075)\n\n* Added `vendored_libraries`
-  attribute to the Specification DSL.  \n  [#809](https://github.com/CocoaPods/CocoaPods/issues/809)\n
-  \ [#1075](https://github.com/CocoaPods/CocoaPods/issues/1075)\n\n* Restructured
-  `.cocoapods` folder to contain repos in a subdirectory.  \n  [Ian Ynda-Hummel](https://github.com/ianyh)\n
-  \ [#1150](https://github.com/CocoaPods/CocoaPods/issues/1150)  \n\n* Improved `pod
-  spec create` template.  \n  [#1223](https://github.com/CocoaPods/CocoaPods/issues/1223)\n\n*
-  Added copy&paste-friendly dependency to `pod search`.  \n  [#1073](https://github.com/CocoaPods/CocoaPods/issues/1073)\n\n*
-  Improved performance of the installation of Pods with git\n  sources which specify
-  a tag.  \n  [#1077](https://github.com/CocoaPods/CocoaPods/issues/1077)\n\n* Core
-  Data `xcdatamodeld` files are now properly referenced from the Pods\n  project.
-  \ \n  [#1155](https://github.com/CocoaPods/CocoaPods/issues/1155)\n\n* Removed punctuation
-  check from the specification validations.  \n  [#1242](https://github.com/CocoaPods/CocoaPods/issues/1242)\n\n*
-  Deprecated the `documentation` attribute of the Specification DSL.  \n  [Core#20](https://github.com/CocoaPods/Core/issues/20)\n\n######
-  Bug Fixes\n\n* Fix copy resource script issue related to filenames with spaces.
-  \ \n  [Denis Hennessy](https://github.com/dhennessy)\n  [#1231](https://github.com/CocoaPods/CocoaPods/issues/1231)
-  \ \n\n\n\n"
+  [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.8.1...0.9.0)\n• [cocoapods-downloader](https://github.com/CocoaPods/cocoapods-downloader/compare/0.1.1...0.1.2)\n\n\n######
+  Enhancements\n\n* Added `pod init` command which generates a Podfile according to
+  the\n  targets of the project stored in the working directory and to the templates\n
+  \ stored in the `~/.cocoapods/templates` folder. Tow templates are supported: \n
+  \   - the `Podfile.default` template for regular targets.\n    - and the `Podfile.test`
+  template for test targets.  \n  \n  [Ian Ynda-Hummel](https://github.com/ianyh)\n
+  \ [#1106](https://github.com/CocoaPods/CocoaPods/issues/1106)  \n  [#1045](https://github.com/CocoaPods/CocoaPods/issues/1045)
+  \ \n\n* CocoaPods will now leverage the [xcproj](https://github.com/0xced/xcproj)\n
+  \ command line tool if available in the path of the user to touch saved\n  projects.
+  This will result in projects being serialized in the exact format\n  used by Xcode
+  eliminating merge conflicts and other related issues. To learn\n  more about how
+  to install xcproj see its\n  [readme](https://github.com/0xced/xcproj).  \n  [Cédric
+  Luthi](https://github.com/0xced)  \n  [#1275](https://github.com/CocoaPods/CocoaPods/issues/1275)
+  \ \n  \n* Rationalized and cleaned up Pods project group structure and path specification.\n\n*
+  Create all necessary build configurations for *Pods.xcodeproj* at the project level.
+  If the user’s project has more than just *Debug* and *Release* build configurations,
+  they may be explicitly specified in the Podfile:  \n`xcodeproj 'MyApp', 'App Store'
+  => :release, 'Debug' => :debug, 'Release' => :release`  \n  If build configurations
+  aren’t specified in the Podfile then they will be automatically picked from the
+  user’s project in *Release* mode.  \n  These changes will ensure that the `libPods.a`
+  static library is not stripped for all configurations, as explained in [#1217](https://github.com/CocoaPods/CocoaPods/pull/1217).
+  \ \n  [Cédric Luthi](https://github.com/0xced)  \n  [#1294](https://github.com/CocoaPods/CocoaPods/issues/1294)\n\n*
+  Added basic support for Bazaar repositories.  \n  [Fred McCann](https://github.com/fmccann)
+  \ \n  [cocoapods-downloader#4](https://github.com/CocoaPods/cocoapods-downloader/pull/4)\n\n######
+  Bug Fixes\n\n* Fixed crash in `pod spec cat`.\n\n* Use the `TARGET_BUILD_DIR` environment
+  variable for installing resource bundles.  \n  [Cédric Luthi](https://github.com/0xced)
+  \ \n  [#1268](https://github.com/CocoaPods/CocoaPods/issues/1268)  \n\n* CoreData
+  versioned models are now properly handled respecting the contents of\n  the `.xccurrentversion`
+  file.  \n  [#1288](https://github.com/CocoaPods/CocoaPods/issues/1288),\n  [Xcodeproj#83](https://github.com/CocoaPods/Xcodeproj/pull/83)
+  \ \n  [Ashton-W](https://github.com/Ashton-W)\n\n* OS X frameworks are now copied
+  to the Resources folder using rsync to\n  properly overwrite existing files.  \n
+  \ [Nikolaj Schumacher](https://github.com/nschum)\n  [#1063](https://github.com/CocoaPods/CocoaPods/issues/1063)\n\n*
+  User defined build configurations are now added to the resource bundle\n  targets.
+  \ \n  [#1309](https://github.com/CocoaPods/CocoaPods/issues/1309),\n\n\n"
 rdoc_options: []
 require_paths:
 - lib