cocoapods 0.22.0 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1f552882d2489715f3154877683645345841303
-  data.tar.gz: f16fc98973864b454debaa5ed50d8272b075377b
+  metadata.gz: a33164a53936d75565f0d57cbf118f7452714030
+  data.tar.gz: 5dfa0d590569a5ea0d4bbb89ec74089fdc3b315d
 SHA512:
-  metadata.gz: e16713b34307e47f67d139a3e7de88a2e00dd9f72bed30bc2e33535a2940fbd05f321b0a8e9f2cab934b22aea5132cb679d6805e59f42e17dddbc9ed3b0623b9
-  data.tar.gz: eca230d41a659af15dc15966008a1004b6502398a3a14529463c4c8ba3afca0f83470f8972533873d0efa3cca25e7f449535e521ff0f6d5e49a75dc48b4be817
+  metadata.gz: bb19c4f40df1b05c5aa5eef068884e94b5c9ed89433283346829375b21e2e7ee91fd36ee1ee1e6053b396cbb5fae2e332818451da26741cbc6e52633ae6bfda4
+  data.tar.gz: be0e7c7f4f883be762aa134ee01e39f425d65d4b57f47c9e5a5f0b7ec7ae57b853a4502c5dc3802ce53252af7bec4fb9cba1278cbdf660f9a94f945f84583a0c

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
 
+## 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)
+
+
 ## 0.22.0
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.21.0...0.22.0)
 • [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.21.0...0.22.0)

data/lib/cocoapods/config.rb

@@ -112,10 +112,10 @@ module Pod
 
     # @!group Initialization
 
-    def initialize
+    def initialize(use_user_settings = true)
       configure_with(DEFAULTS)
 
-      if user_settings_file.exist?
+      if use_user_settings && user_settings_file.exist?
         require 'yaml'
         user_settings = YAML.load_file(user_settings_file)
         configure_with(user_settings)

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/installer.rb

@@ -339,8 +339,14 @@ module Pod
           add_dependency(aggregate_target, pod_target)
           pod_target.dependencies.each do |dep|
 
-            pod_dependency_target = aggregate_target.pod_targets.find { |target| target.root_spec.name == dep }
-            add_dependency(pod_target, pod_dependency_target)
+            unless dep == pod_target.pod_name
+              pod_dependency_target = aggregate_target.pod_targets.find { |target| target.pod_name == dep }
+              # TODO remove me
+              unless pod_dependency_target
+                puts "[BUG] DEP: #{dep}"
+              end
+              add_dependency(pod_target, pod_dependency_target)
+            end
           end
         end
       end

data/lib/cocoapods/target/pod_target.rb

@@ -43,18 +43,24 @@ module Pod
       specs.map { |spec| spec.consumer(platform) }
     end
 
-    # @return [Specification] the root specification for the target.
+    # @return [Specification] The root specification for the target.
     #
     def root_spec
       specs.first.root
     end
 
+    # @return [String] The name of the Pod that this target refers to.
+    #
+    def pod_name
+      root_spec.name
+    end
+
     # @return [Array<String>] The names of the Pods on which this target
     #         depends.
     #
     def dependencies
       specs.map do |spec|
-        spec.consumer(platform).dependencies.map { |dep| dep.name }
+        spec.consumer(platform).dependencies.map { |dep| Specification.root_name(dep.name) }
       end.flatten
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.22.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.22.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.22.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -237,53 +237,15 @@ post_install_message: |2+
 
   CHANGELOG:
 
-  ## 0.22.0
-  [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.21.0...0.22.0)
-  • [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.21.0...0.22.0)
-  • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.7.1...0.8.0)
-
-  ###### Enhancements
-
-  * Added the `pod lib create` subcommand which allows to create a new Pod
-    adhering to the best practices. The template is still a bit primitive
-    and we encourage users to provide feedback by submitting patches and issues
-    to https://github.com/CocoaPods/CocoaPods.
-    [#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).
-    [#850](https://github.com/CocoaPods/CocoaPods/issues/850)
-
-  * The dependencies of the targets of the Pods project are now made explicit.
-    [#1165](https://github.com/CocoaPods/CocoaPods/issues/1165)
-
-  * The size of the cache used for the git repos is now configurable. For more
-    details see
-    https://github.com/CocoaPods/CocoaPods/blob/master/lib/cocoapods/config.rb#L7-L25
-    [#1159](https://github.com/CocoaPods/CocoaPods/issues/1159)
-
-  * The copy resources shell script now aborts if any error occurs.
-    [#1098](https://github.com/CocoaPods/CocoaPods/issues/1098)
-
-  * The output of shell script build phases no longer includes environment
-    variables to reduce noise.
-    [#1122](https://github.com/CocoaPods/CocoaPods/issues/1122)
-
-  * CocoaPods no longer sets the deprecated `ALWAYS_SEARCH_USER_PATHS` build
-    setting.
+  ## 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
 
-  * Pods whose head state changes now are correctly detected and reinstalled.
-    [#1160](https://github.com/CocoaPods/CocoaPods/issues/1160)
-
-  * Fixed the library reppresentation of the hooks which caused issues with the
-    `#copy_resources_script_path` method.
-    [#1157](https://github.com/CocoaPods/CocoaPods/issues/1157)
+  * Fixed a crash related to target dependencies and subspecs.
+    [#1168](https://github.com/CocoaPods/CocoaPods/issues/1168)
 
-  * Frameworks symlinks are not properly preserved by the copy resources script.
-    Thanks to Thomas Dohmke (ashtom) for the fix.
-    [#1063](https://github.com/CocoaPods/CocoaPods/issues/1063)
 
 rdoc_options: []
 require_paths: