Merge branch 'master' into 0.17

* master:
  Update README.md
  Release 0.16.1
  [Gemspec] Bump Xcodeproj to 0.4.1
  [CHANGELOG] Update for Xcodeproj 0.4.1 and CocoaPods 0.16.1
  Update bundle and make specs green.
  [Update Command] Remove duplicate option in help. Closes #725.
  Update previous patch to match code-style.
  Unpack tgz files into pod's root #727
  If a repo isn't passed to push default to master

Conflicts:
	CHANGELOG.md
	Gemfile.lock
	cocoapods.gemspec
	lib/cocoapods.rb
	lib/cocoapods/command/push.rb
	lib/cocoapods/command/update.rb
	lib/cocoapods/downloader/http.rb
	spec/functional/downloader_spec.rb
	spec/unit/http_spec.rb

CHANGELOG.md

@@ -64,6 +64,30 @@
 - Added Library class.
 - Added XCConfig generator.
 
+## 0.16.1
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.0...0.16.1) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.4.0...0.4.1)
+
+###### Bug fixes
+
+- After unpacking source from a HTTP location, move the source into the parent
+  dir if the archive contained only one child. This is done to make it
+  consistent with how source from other types of locations are described in a
+  podspec.
+  **NOTE** This might break some podspecs that assumed the incorrect layout.
+  [#727](https://github.com/CocoaPods/CocoaPods/issues/727)
+  [#728](https://github.com/CocoaPods/CocoaPods/pull/728)
+- Remove duplicate option in `pod update` command.
+  [#725](https://github.com/CocoaPods/CocoaPods/issues/725)
+- Memory fixes in Xcodeproj.
+  [#43](https://github.com/CocoaPods/Xcodeproj/pull/43)
+
+###### Xcodeproj Enhancements
+
+- Sort contents of xcconfig files by setting name.
+  [#591](https://github.com/CocoaPods/CocoaPods/issues/591)
+- Add helpers to get platform name, deployment target, and frameworks build phases
+- Take SDKROOT into account when adding frameworks.
+
 ## 0.16.0
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.0.rc5...master)
 

Gemfile.lock

 GIT
   remote: git://github.com/CocoaPods/Core.git
-  revision: 423f7364a74324db85238d3e8f8587b8191d7372
+  revision: cccab9046f9c94f9eeba6dff6a3783589315c7f9
   specs:
     cocoapods-core (0.17.0.alpha)
       activesupport (~> 3.2.6)
@@ -9,15 +9,15 @@ GIT
 
 GIT
   remote: git://github.com/CocoaPods/Xcodeproj.git
-  revision: 161ed66566a887208d1b20344b920a946664bdee
+  revision: 39b060359900d5d319f8e42e50d641ef58bf7825
   specs:
-    xcodeproj (0.4.0)
+    xcodeproj (0.4.1)
       activesupport (~> 3.2.6)
       colored (~> 1.2)
 
 GIT
   remote: git://github.com/CocoaPods/cocoapods-downloader
-  revision: b349db398d5e9205a67974f70906fec2c7a0e588
+  revision: f5fc744975f89be09bce4775ed255c0f7b8eee33
   specs:
     cocoapods-downloader (0.1.0)
 
@@ -44,17 +44,17 @@ PATH
       octokit (~> 1.7)
       open4 (~> 1.3.0)
       rake (~> 0.9.4)
-      xcodeproj (~> 0.4.0)
+      xcodeproj (~> 0.4.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.9)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.3.2)
     awesome_print (1.1.0)
-    bacon (1.1.0)
+    bacon (1.2.0)
     claide (0.2.0)
     coderay (1.0.8)
     colored (1.2)
@@ -66,8 +66,8 @@ GEM
     github-markup (0.7.5)
     hashie (1.2.0)
     i18n (0.6.1)
-    json (1.7.5)
-    listen (0.6.0)
+    json (1.7.6)
+    listen (0.7.2)
     metaclass (0.0.1)
     method_source (0.8.1)
     mocha (0.11.4)
@@ -76,23 +76,25 @@ GEM
       mocha (>= 0.9.8)
     multi_json (1.5.0)
     multipart-post (1.1.5)
-    octokit (1.19.0)
+    netrc (0.7.7)
+    octokit (1.21.0)
       addressable (~> 2.2)
       faraday (~> 0.8)
       faraday_middleware (~> 0.9)
       hashie (~> 1.2)
       multi_json (~> 1.3)
+      netrc (~> 0.7.7)
     open4 (1.3.0)
     posix-spawn (0.3.6)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
-    pygments.rb (0.3.3)
+    pygments.rb (0.3.7)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rake (0.9.6)
-    rb-fsevent (0.9.2)
+    rb-fsevent (0.9.3)
     redcarpet (2.2.2)
     slop (3.3.3)
     terminal-notifier (1.4.2)

README.md

@@ -8,7 +8,7 @@
 CocoaPods manages library dependencies for your Xcode project.
 
 Homepage: [http://cocoapods.org/](http://cocoapods.org/)
-Twitter: [@CocoaPodsOrg](http://twitter.com/CocoaPodsOrg)
+Twitter: [@CocoaPods](http://twitter.com/CocoaPods)
 Mailing List: [http://groups.google.com/group/cocoapods](http://groups.google.com/group/cocoapods)
 
 You specify the dependencies for your project in one easy text file. CocoaPods resolves dependencies between libraries, fetches source code for the dependencies, and creates and maintains an Xcode workspace to build your project.
@@ -105,7 +105,7 @@ There are several other ways to start using **any** library without a Pod specif
 
 All CocoaPods development happens on GitHub, there is a repository for [CocoaPods](https://github.com/CocoaPods/CocoaPods) and one for the [CocoaPods specs](https://github.com/CocoaPods/Specs). Contributing patches or Pods is really easy and gratifying. You even get push access when one of your specs or patches is accepted.
 
-Follow [@CocoaPodsOrg](http://twitter.com/CocoaPodsOrg) to get up to date information about what's going on in the CocoaPods world.
+Follow [@CocoaPods](http://twitter.com/CocoaPods) to get up to date information about what's going on in the CocoaPods world.
 
 
 # Donations

cocoapods.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'cocoapods-core'
   s.add_runtime_dependency 'claide',        '~> 0.1'
-  s.add_runtime_dependency 'xcodeproj',     '~> 0.4.0'
+  s.add_runtime_dependency 'xcodeproj',     '~> 0.4.1'
 
   s.add_runtime_dependency 'faraday',       '~> 0.8.1'
   s.add_runtime_dependency 'octokit',       '~> 1.7'

lib/cocoapods/command/push.rb

@@ -24,7 +24,14 @@ module Pod
         @allow_warnings = argv.flag?('allow-warnings')
         @local_only = argv.flag?('local-only')
         @repo = argv.shift_argument
-        @podspec = argv.shift_argument
+        if @repo.nil?
+          @repo = "master"
+        elsif @repo.end_with? ".podspec"
+          @podspec = @repo
+          @repo = "master"
+        else
+          @podspec = argv.shift_argument
+        end
         super
       end
 

spec/functional/command/push_spec.rb

@@ -3,17 +3,12 @@ require File.expand_path('../../../spec_helper', __FILE__)
 module Pod
   describe Command::Push do
     extend SpecHelper::Command
-    
     extend SpecHelper::TemporaryRepos
 
     before do
       config.repos_dir = SpecHelper.tmp_repos_path
     end
 
-    it "requires a spec-repo name" do
-      lambda { command('push').validate! }.should.raise CLAide::Help
-    end
-
     it "complains if it can't find the repo" do
       Dir.chdir(fixture('banana-lib')) do
         cmd = command('push', 'missing_repo')