cocoapods 1.0.0.beta.1 → 1.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 314a9c28d7e724d52123840995db3f62cca1f870
-  data.tar.gz: 6f932912c5fbbc7bd9e71a96e89055bddfb860e1
+  metadata.gz: 99aac79324a67815f74a8175fa16465c8b7a3c21
+  data.tar.gz: 234cd7e4caa85cd06b38e04037ceff2ab548d29b
 SHA512:
-  metadata.gz: 6f02253e12e95ee996665f234a070536cf672af5ef4890cf12dc005bf8f5c8fd9c78b6f505767c2053868e08c6a12b0ccdb0206e9a2e2dd38a3dc73983534a21
-  data.tar.gz: 3fe3bafbeff16966db0506d358747682031c2dc13d99d2367937e51793f17a7d5d37018a03771943dac94619d28e1e6c6aa124ed9eda65296fcd49303d9f4ee4
+  metadata.gz: 45a4d7e290988cd133109a74ae79268ccc3229a8f5772aff37d6b1205ca71d3d279acbc642f41f881be97b21c1f4dbd45d160692ce9e5266af5e97661e04c30b
+  data.tar.gz: a6da707743eb4dd997d5496d0071bb31b471701604192c3c8b1a08604fd076262a7c54153a022aa8a0b15be5f9b5c365b33c2dab258dd1c0a6ec0fdbe94864d2

data/CHANGELOG.md

@@ -4,6 +4,44 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.0.0.beta.2 (2016-01-05)
+
+##### Enhancements
+
+* Present a friendly error suggesting running `pod install` when there are
+  missing local podspecs when running `pod outdated`.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#4716](https://github.com/CocoaPods/CocoaPods/issues/4716)
+
+* Don't warn about setting base config when identical to current config.  
+  [Jed Lewison](https://github.com/jedlewison)
+  [#4722](https://github.com/CocoaPods/CocoaPods/issues/4722)
+
+* Add `user_targets` method to the `UmbrellaTargetDescription` in the
+  post-install hooks context.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+##### Bug Fixes
+
+* Always fetch a `:podspec` dependency's podspec when it is missing in the
+  `Pods` directory.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#4717](https://github.com/CocoaPods/CocoaPods/issues/4717)
+
+* The `Info.plist` file will now be generated properly for resource bundles,
+  setting the proper `CFBundlePackageType` and omitting the `CFBundleExecutable`
+  key.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [Xcodeproj#259](https://github.com/CocoaPods/Xcodeproj/issues/259)
+
+* Fix crash when deintegrating due to major version change and there are
+  multiple root-level Xcode projects.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Ensure the `sandbox_root` attribute is set on the pre-install hooks context.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+
 ## 1.0.0.beta.1 (2015-12-30)
 
 ##### Breaking

data/lib/cocoapods/command/outdated.rb

@@ -52,6 +52,7 @@ module Pod
 
       def updates
         @updates ||= begin
+          ensure_external_podspecs_present!
           spec_sets.map do |set|
             spec = set.specification
             source_version = set.versions.first
@@ -111,6 +112,17 @@ module Pod
           config.lockfile
         end
       end
+
+      def ensure_external_podspecs_present!
+        return unless config.podfile
+        config.podfile.dependencies.each do |dep|
+          next if dep.external_source.nil?
+          unless config.sandbox.specification(dep.root_name)
+            raise Informative, 'You must run `pod install` first to ensure that the ' \
+              "podspec for `#{dep.root_name}` has been fetched."
+          end
+        end
+      end
     end
   end
 end

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the CocoaPods command line tool.
   #
-  VERSION = '1.0.0.beta.1'.freeze unless defined? Pod::VERSION
+  VERSION = '1.0.0.beta.2'.freeze unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/info_plist_file.rb

@@ -9,12 +9,20 @@ module Pod
       #
       attr_reader :target
 
+      # @return [Symbol] the CFBundlePackageType of the target this Info.plist
+      #         file is for.
+      #
+      attr_reader :bundle_package_type
+
       # Initialize a new instance
       #
       # @param  [Target] target @see target
       #
-      def initialize(target)
+      # @param  [Symbol] bundle_package_type @see bundle_package_type
+      #
+      def initialize(target, bundle_package_type: :fmwk)
         @target = target
+        @bundle_package_type = bundle_package_type
       end
 
       # Generates and saves the Info.plist to the given path.
@@ -51,7 +59,7 @@ module Pod
       # @return [String]
       #
       def generate
-        header + dict + footer
+        to_plist(info)
       end
 
       private
@@ -61,51 +69,56 @@ module Pod
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
         PLIST
       end
 
       def footer
         <<-PLIST
-</dict>
 </plist>
         PLIST
       end
 
-      def dict
-        dict = <<-PLIST
-  <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
-  <key>CFBundleExecutable</key>
-  <string>${EXECUTABLE_NAME}</string>
-  <key>CFBundleIdentifier</key>
-  <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>${PRODUCT_NAME}</string>
-  <key>CFBundlePackageType</key>
-  <string>FMWK</string>
-  <key>CFBundleShortVersionString</key>
-  <string>#{target_version}</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>${CURRENT_PROJECT_VERSION}</string>
-  <key>NSPrincipalClass</key>
-  <string></string>
-        PLIST
+      def to_plist(root)
+        serialize(root, header) << footer
+      end
 
-        if target.platform.name == :tvos
-          dict << <<-PLIST
-  <key>UIRequiredDeviceCapabilities</key>
-  <array>
-    <string>arm64</string>
-  </array>
-          PLIST
+      def serialize(value, output, indentation = 0)
+        indent = ' ' * indentation
+        case value
+        when Array
+          output << indent << "<array>\n"
+          value.each { |v| serialize(v, output, indentation + 2) }
+          output << indent << "</array>\n"
+        when Hash
+          output << indent << "<dict>\n"
+          value.to_a.sort_by(&:first).each do |key, v|
+            output << indent << '  ' << "<key>#{key}</key>\n"
+            serialize(v, output, indentation + 2)
+          end
+          output << indent << "</dict>\n"
+        when String
+          output << indent << "<string>#{value}</string>\n"
         end
+        output
+      end
+
+      def info
+        info = {
+          'CFBundleIdentifier' => '${PRODUCT_BUNDLE_IDENTIFIER}',
+          'CFBundleInfoDictionaryVersion' => '6.0',
+          'CFBundleName' => '${PRODUCT_NAME}',
+          'CFBundlePackageType' => bundle_package_type.to_s.upcase,
+          'CFBundleShortVersionString' => target_version,
+          'CFBundleSignature' => '????',
+          'CFBundleVersion' => '${CURRENT_PROJECT_VERSION}',
+          'NSPrincipalClass' => '',
+          'CFBundleDevelopmentRegion' => 'en',
+        }
+
+        info['CFBundleExecutable'] = '${EXECUTABLE_NAME}' if bundle_package_type != :bndl
+        info['UIRequiredDeviceCapabilities'] = %w(arm64) if target.platform.name == :tvos
 
-        dict
+        info
       end
     end
   end

data/lib/cocoapods/installer.rb

@@ -502,11 +502,11 @@ module Pod
     def deintegrate_if_different_major_version
       return unless lockfile
       return if lockfile.cocoapods_version.major == Version.create(VERSION).major
-      UI.section('Fully deintegrating due to major version update') do
+      UI.section('Re-creating CocoaPods due to major version update.') do
         projects = Pathname.glob(config.installation_root + '*.xcodeproj').map { |path| Xcodeproj::Project.open(path) }
         deintegrator = Deintegrator.new
-        projects.sort.each do |project|
-          deintegrator.deintegrate_project(project)
+        projects.each do |project|
+          config.with_changes(:silent => true) { deintegrator.deintegrate_project(project) }
           project.save if project.dirty?
         end
       end

data/lib/cocoapods/installer/analyzer.rb

@@ -443,7 +443,7 @@ module Pod
         unless dependencies_to_fetch.empty?
           UI.section 'Fetching external sources' do
             dependencies_to_fetch.sort.each do |dependency|
-              fetch_external_source(dependency, !pods_to_fetch.include?(dependency.name))
+              fetch_external_source(dependency, !pods_to_fetch.include?(dependency.root_name))
             end
           end
         end
@@ -481,7 +481,7 @@ module Pod
             deps_to_fetch = deps_with_external_source.select { |dep| pods_to_fetch.include?(dep.name) }
             deps_to_fetch_if_needed = deps_with_external_source.select { |dep| result.podfile_state.unchanged.include?(dep.name) }
             deps_to_fetch += deps_to_fetch_if_needed.select do |dep|
-              sandbox.specification(dep.name).nil? ||
+              sandbox.specification(dep.root_name).nil? ||
                 !dep.external_source[:path].nil? ||
                 !sandbox.pod_dir(dep.root_name).directory? ||
                 checkout_requires_update?(dep)
@@ -506,6 +506,9 @@ module Pod
           elsif update_mode == :all
             pods_to_fetch += result.podfile_state.unchanged + result.podfile_state.deleted
           end
+          pods_to_fetch += podfile.dependencies.
+            select { |dep| Hash(dep.external_source).key?(:podspec) && sandbox.specification_path(dep.root_name).nil? }.
+            map(&:root_name)
           pods_to_fetch
         end
       end

data/lib/cocoapods/installer/post_install_hooks_context.rb

@@ -38,7 +38,7 @@ module Pod
         aggregate_targets.each do |umbrella|
           desc = UmbrellaTargetDescription.new
           desc.user_project = umbrella.user_project
-          desc.user_target_uuids = umbrella.user_target_uuids
+          desc.user_targets = umbrella.user_targets
           desc.specs = umbrella.specs
           desc.platform_name = umbrella.platform.name
           desc.platform_deployment_target = umbrella.platform.deployment_target.to_s
@@ -69,6 +69,11 @@ module Pod
           user_project.path if user_project
         end
 
+        # @return [Array<PBXNativeTarget>]
+        #         The list of user targets integrated by this umbrella target.
+        #
+        attr_accessor :user_targets
+
         # @return [Array<String>] The list of the UUIDs of the
         #         user targets integrated by this umbrella
         #         target.  They can be used to find the
@@ -76,7 +81,9 @@ module Pod
         #         to find the targets opening the project with
         #         Xcodeproj.
         #
-        attr_accessor :user_target_uuids
+        def user_target_uuids
+          user_targets.map(&:uuid)
+        end
 
         # @return [Array<Specification>] The list of the
         #         specifications of the target.

data/lib/cocoapods/installer/pre_install_hooks_context.rb

@@ -33,6 +33,7 @@ module Pod
         result = new
         result.podfile = podfile
         result.sandbox = sandbox
+        result.sandbox_root = sandbox.root.to_s
         result.lockfile = lockfile
         result
       end

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

@@ -169,7 +169,7 @@ module Pod
             path = target.info_plist_path
             path.dirname.mkdir unless path.dirname.exist?
             info_plist_path = path.dirname + "ResourceBundle-#{bundle_name}-#{path.basename}"
-            generator = Generator::InfoPlistFile.new(target)
+            generator = Generator::InfoPlistFile.new(target, :bundle_package_type => :bndl)
             generator.save_as(info_plist_path)
             add_file_to_support_group(info_plist_path)
 

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

@@ -88,12 +88,14 @@ module Pod
               if existing.real_path.to_path.start_with?(pod_bundle.sandbox.root.to_path << '/')
                 set_base_configuration_reference.call
               elsif !xcconfig_includes_target_xcconfig?(config.base_configuration_reference, path)
-                UI.warn 'CocoaPods did not set the base configuration of your ' \
-                'project because your project already has a custom ' \
-                'config set. In order for CocoaPods integration to work at ' \
-                'all, please either set the base configurations of the target ' \
-                "`#{target.name}` to `#{path}` or include the `#{path}` in your " \
-                "build configuration (#{UI.path(existing.real_path)})."
+                unless existing_config_is_identical_to_pod_config?(existing.real_path, pod_bundle.xcconfig_path(config.name))
+                  UI.warn 'CocoaPods did not set the base configuration of your ' \
+                  'project because your project already has a custom ' \
+                  'config set. In order for CocoaPods integration to work at ' \
+                  'all, please either set the base configurations of the target ' \
+                  "`#{target.name}` to `#{path}` or include the `#{path}` in your " \
+                  "build configuration (#{UI.path(existing.real_path)})."
+                end
               end
             elsif config.base_configuration_reference.nil? || file_ref.nil?
               set_base_configuration_reference.call
@@ -159,6 +161,16 @@ module Pod
             /x
             base_config_ref.real_path.readlines.find { |line| line =~ regex }
           end
+
+          # Checks to see if the config files at two paths exist and are identical
+          #
+          # @param  The existing config path
+          #
+          # @param  The pod config path
+          #
+          def self.existing_config_is_identical_to_pod_config?(existing_config_path, pod_config_path)
+            existing_config_path.file? && (!pod_config_path.file? || FileUtils.compare_file(existing_config_path, pod_config_path))
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.1
+  version: 1.0.0.beta.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.1
+        version: 1.0.0.beta.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.1
+        version: 1.0.0.beta.2
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +133,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.1
+        version: 1.0.0.beta.2
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -143,7 +143,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.1
+        version: 1.0.0.beta.2
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -173,7 +173,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.1
+        version: 1.0.0.beta.2
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -183,7 +183,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.1
+        version: 1.0.0.beta.2
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'