cocoapods 1.0.0.rc.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10cc847dafb37dea6b8a09cb9580afe80d4d1106
-  data.tar.gz: e3c96f807164e680f6a85ecba67e9061f3100b4e
+  metadata.gz: 089fd601f4b77b13ce571371163234e74681fc6a
+  data.tar.gz: 2ba921d00ae8b35bad6446d8d86bc4437766dcec
 SHA512:
-  metadata.gz: 6b4653c6071dfd503374ecc79fa454d121a76ea9b64733f7865a4fd01fc03ae97743d9b99f16dc2bda97de2be6c73b4b92510c757fefe9ac9ce4a0818992b2b1
-  data.tar.gz: 0edef28472879d501ce59e55777a3e693f9c9a3da6569947fd7244bd5738d7a85c7814518b1f51ecf332237388151a735fa5cc4db3b53234b64eee977b9fb8db
+  metadata.gz: dc073ce49be6c7c75b2e80f4eb888bb68d623f9041721129877a1a074eafa231e984f3ff93b25756784cf43e0bb741a1e7405ceb7d177799f14b920d1c64afcc
+  data.tar.gz: b21370ae05fa41e645bcf4d7ce27ee6e2b13507098ce5b4540f54cdd2b042ff26981cea047169379d911eac0835a72575842195ff5acfd0c7699142fdbf235ff

data/CHANGELOG.md

@@ -4,6 +4,30 @@ 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 (2016-05-10)
+
+##### Enhancements
+
+* Validate that resource bundles declared in the podspec contain resources.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#5218](https://github.com/CocoaPods/CocoaPods/issues/5218)
+
+* Improvements to the error messaging around missing dependencies.  
+  [Orta Therox](https://github.com/orta)
+  [#5260](https://github.com/CocoaPods/CocoaPods/issues/5260)
+
+* Make sharing schemes for development pods an installation option
+  (`share_schemes_for_development_pods`) and disable sharing schemes
+  by default.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+##### Bug Fixes
+
+* Fix search paths inheritance when there are transitive dependencies.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#5264](https://github.com/CocoaPods/CocoaPods/issues/5264)
+
+
 ## 1.0.0.rc.2 (2016-05-04)
 
 ##### Enhancements

data/lib/cocoapods/gem_version.rb

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

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

@@ -63,7 +63,7 @@ module Pod
             @xcconfig.merge!(file_accessor.spec_consumer.pod_target_xcconfig)
           end
           XCConfigHelper.add_target_specific_settings(target, @xcconfig)
-          @xcconfig.merge! XCConfigHelper.settings_for_dependent_targets(target, target.dependent_targets)
+          @xcconfig.merge! XCConfigHelper.settings_for_dependent_targets(target, target.recursive_dependent_targets)
           @xcconfig
         end
 

data/lib/cocoapods/installer.rb

@@ -703,10 +703,29 @@ module Pod
     #
     def share_development_pod_schemes
       development_pod_targets.select(&:should_build?).each do |pod_target|
+        next unless share_scheme_for_development_pod?(pod_target.pod_name)
         Xcodeproj::XCScheme.share_scheme(pods_project.path, pod_target.label)
       end
     end
 
+    # @param  [String] pod The root name of the development pod.
+    #
+    # @return [Bool] whether the scheme for the given development pod should be
+    #         shared.
+    #
+    def share_scheme_for_development_pod?(pod)
+      case dev_pods_to_share = installation_options.share_schemes_for_development_pods
+      when TrueClass, FalseClass, NilClass
+        dev_pods_to_share
+      when Array
+        dev_pods_to_share.any? { |dev_pod| dev_pod === pod } # rubocop:disable Style/CaseEquality
+      else
+        raise Informative, 'Unable to handle share_schemes_for_development_pods ' \
+          "being set to #{dev_pods_to_share.inspect} -- please set it to true, " \
+          'false, or an array of pods to share schemes for.'
+      end
+    end
+
     # Writes the Podfile and the lock files.
     #
     # @todo   Pass the checkout options to the Lockfile.

data/lib/cocoapods/installer/installation_options.rb

@@ -106,6 +106,7 @@ module Pod
       option :deterministic_uuids, true
       option :integrate_targets, true
       option :lock_pod_sources, true
+      option :share_schemes_for_development_pods, false
 
       module Mixin
         module ClassMethods

data/lib/cocoapods/resolver.rb

@@ -419,20 +419,22 @@ module Pod
             end
             message << "\nYou should explicitly specify the version in order to install a pre-release version"
           elsif !conflict.existing
-            conflict.requirements.values.flatten.uniq.each do |r|
-              if search_for(r).empty?
-                # There are no existing specification inside any of the spec repos with given requirements.
-                message << "\n\nNone of your spec sources contain a spec satisfying the dependency: `#{r}`." \
-                  "\n\nYou have either:" \
-                  "\n * out-of-date source repos which you can update with `pod repo update`." \
-                  "\n * mistyped the name or version." \
-                  "\n * not added the source repo that hosts the Podspec to your Podfile." \
-                  "\n\nNote: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by default."
-
-              else
-                message << "\n\nSpecs satisfying the `#{r}` dependency were found, " \
-                  'but they required a higher minimum deployment target.'
-              end
+            conflicts = conflict.requirements.values.flatten.uniq
+            found_conflicted_specs = conflicts.reject { |c| search_for(c).empty? }
+            if found_conflicted_specs.empty?
+              # There are no existing specification inside any of the spec repos with given requirements.
+              dependencies = conflicts.count == 1 ? 'dependency' : 'dependencies'
+              message << "\n\nNone of your spec sources contain a spec satisfying "\
+                "the #{dependencies}: `#{conflicts.join(', ')}`." \
+                "\n\nYou have either:" \
+                "\n * out-of-date source repos which you can update with `pod repo update`." \
+                "\n * mistyped the name or version." \
+                "\n * not added the source repo that hosts the Podspec to your Podfile." \
+                "\n\nNote: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by default."
+
+            else
+              message << "\n\nSpecs satisfying the `#{conflicts.join(', ')}` dependency were found, " \
+                'but they required a higher minimum deployment target.'
             end
           end
         end

data/lib/cocoapods/target/pod_target.rb

@@ -184,6 +184,15 @@ module Pod
       end.uniq
     end
 
+    # @return [Array<PodTarget>] the recursive targets that this target has a
+    #         dependency upon.
+    #
+    def recursive_dependent_targets
+      targets = dependent_targets + dependent_targets.flat_map(&:recursive_dependent_targets)
+      targets.uniq!
+      targets
+    end
+
     # Checks if the target should be included in the build configuration with
     # the given name of a given target definition.
     #

data/lib/cocoapods/validator.rb

@@ -556,6 +556,13 @@ module Pod
       end
     end
 
+    def _validate_resource_bundles
+      file_accessor.resource_bundles.each do |bundle, resource_paths|
+        next unless resource_paths.empty?
+        error('file patterns', "The `resource_bundles` pattern for `#{bundle}` did not match any file.")
+      end
+    end
+
     # Ensures that a list of header files only contains header files.
     #
     def _validate_header_files(attr_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,126 +19,174 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.2
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.1
+        version: 1.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - <
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: cocoapods-deintegrate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - <
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.2
+        version: 1.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: cocoapods-downloader
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.1
+        version: 1.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - <
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: cocoapods-plugins
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - <
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.1
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - <
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: cocoapods-search
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - <
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.1
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.1
+        version: 1.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: cocoapods-stats
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - <
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.1
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - <
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: cocoapods-trunk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.1
+        version: 1.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.1
+        version: 1.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: cocoapods-try
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - <
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.1
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - <
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: molinillo
   requirement: !ruby/object:Gem::Requirement
@@ -157,16 +205,22 @@ dependencies:
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - <
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - <
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement