Closes CocoaPods#2136.

ashfurrow · May 21, 2014 · 6262f00 · 6262f00
1 parent ddfd715
commit 6262f00
Show file tree

Hide file tree

Showing 8 changed files with 194 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
 
+## Master
+
+* Fixed `pod outdated` to not include subspecs.
+  [Ash Furrow](ashfurrow]
+  [#2136](https://github.com/CocoaPods/CocoaPods/issues/2136)
+
+
 ## 0.33.1
 
 ##### Bug Fixes

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,13 +1,21 @@
 GIT
   remote: https://github.com/CocoaPods/CLAide.git
+<<<<<<< HEAD
   revision: dc0824a1d7a03dc67b9e3dbfccdd4992241ddc0b
+=======
+  revision: 60c953148e3c09af3e0b6e4cc31e6491d14f97c1
+>>>>>>> WIP #2136.
   branch: master
   specs:
     claide (0.6.1)
 
 GIT
   remote: https://github.com/CocoaPods/Core.git
+<<<<<<< HEAD
   revision: 6af534e951a0887e12c77332ce653270047b9341
+=======
+  revision: 6b633001b01001b4a7d9ffe4f4cae1c31279ebab
+>>>>>>> WIP #2136.
   branch: master
   specs:
     cocoapods-core (0.33.1)
@@ -27,14 +35,22 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/cocoapods-downloader.git
+<<<<<<< HEAD
   revision: 6b2fbda4342ced96df16a55dfa907636dc366b53
+=======
+  revision: 52f097e4afaab8ff2d4dd1e94861f05f8fbe5616
+>>>>>>> WIP #2136.
   branch: master
   specs:
     cocoapods-downloader (0.6.1)
 
 GIT
   remote: https://github.com/CocoaPods/cocoapods-plugins.git
+<<<<<<< HEAD
   revision: f03cfe8c39172ba1dd9b714a91e04e79a68d0711
+=======
+  revision: 3a03deab73c85c36865476d0cbc67bec7e80b5e8
+>>>>>>> WIP #2136.
   branch: master
   specs:
     cocoapods-plugins (0.2.0)
@@ -52,7 +68,11 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/cocoapods-try.git
+<<<<<<< HEAD
   revision: 40d716f925e7b9c3f014b93a0a78d7bf94e9a0b3
+=======
+  revision: 0d77b0759eb01ec556e371a6c55b3175e285d574
+>>>>>>> WIP #2136.
   branch: master
   specs:
     cocoapods-try (0.3.0)

diff --git a/lib/cocoapods/command/outdated.rb b/lib/cocoapods/command/outdated.rb
@@ -56,7 +56,7 @@ def updates
           spec_sets.map do |set|
             spec = set.specification
             source_version = set.versions.first
-            pod_name = spec.name
+            pod_name = spec.root.name
             lockfile_version = lockfile.version(pod_name)
             if source_version > lockfile_version
               [pod_name, lockfile_version, source_version]

diff --git a/node_modules/aspell/README.md b/node_modules/aspell/README.md
diff --git a/node_modules/aspell/aspell.js b/node_modules/aspell/aspell.js
diff --git a/node_modules/aspell/package.json b/node_modules/aspell/package.json
diff --git a/spec/cocoapods-integration-specs b/spec/cocoapods-integration-specs
diff --git a/spec/functional/command/outdated_spec.rb b/spec/functional/command/outdated_spec.rb
@@ -18,6 +18,23 @@ module Pod
       end
     end
 
+    it 'tells the user only about podspecs that have no parent' do
+      spec = Specification.new(nil, 'BlocksKit')
+      subspec = Specification.new(spec, 'UIKit')
+      set = mock
+      set.stubs(:versions).returns(['2.0'])
+      set.stubs(:specification).returns(spec)
+      subset = mock
+      subset.stubs(:specification).returns(subspec)
+      subset.stubs(:versions).returns(['2.0'])
+      version = mock
+      version.stubs(:version).returns('1.0')
+      Command::Outdated.any_instance.stubs(:spec_sets).returns([set, subset])
+      Command::Outdated.any_instance.stubs(:lockfile).returns(version)
+      run_command('outdated', '--no-repo-update')
+      UI.output.should.not.include('UIKit')
+    end
+
     it 'tells the user about deprecated pods' do
       spec = Specification.new(nil, 'AFNetworking')
       spec.deprecated_in_favor_of = 'BlocksKit'