Merge branch 'master' of github.com:CocoaPods/CocoaPods

* 'master' of github.com:CocoaPods/CocoaPods:
  Make all the examples build on 1.9.3 as well.
  Silence warnings while loading Faraday for Octokit. See #278.
  Remove stray file.
  Update RKTwitter example. ALL EXAMPLES BUILD!

Gemfile

@@ -5,13 +5,8 @@ gem "escape"
 gem "json"
 gem "open4"
 
-# We don't want octokit to pull in faraday 0.8.0, as it prints a warning about
-# the `system_timer` gem being needed, which isn't available on 1.9.x
-#
-# Once faraday 0.8.1 is released this should be resolved:
-# https://github.com/technoweenie/faraday/pull/147
-gem "faraday", "0.7.6"
-gem "octokit", "<= 1.0.3"
+gem "faraday", ">= 0.8.1"
+gem "octokit"
 
 group :development do
   gem "xcodeproj", :git => "git://github.com/CocoaPods/Xcodeproj.git"

Gemfile.lock

@@ -14,10 +14,8 @@ GEM
     colored (1.2)
     crack (0.3.1)
     escape (0.0.4)
-    faraday (0.7.6)
-      addressable (~> 2.2)
+    faraday (0.8.1)
       multipart-post (~> 1.1)
-      rack (~> 1.1)
     faraday_middleware (0.8.7)
       faraday (>= 0.7.4, < 0.9)
     hashie (1.2.0)
@@ -32,9 +30,9 @@ GEM
       mocha (>= 0.9.8)
     multi_json (1.3.6)
     multipart-post (1.1.5)
-    octokit (1.0.3)
+    octokit (1.3.0)
       addressable (~> 2.2)
-      faraday (~> 0.7)
+      faraday (~> 0.8)
       faraday_middleware (~> 0.8)
       hashie (~> 1.2)
       multi_json (~> 1.3)
@@ -43,7 +41,6 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.7.1)
       slop (>= 2.4.4, < 3)
-    rack (1.4.1)
     rake (0.9.2.2)
     rb-fsevent (0.9.1)
     slop (2.4.4)
@@ -60,11 +57,11 @@ DEPENDENCIES
   bacon
   colored
   escape
-  faraday (= 0.7.6)
+  faraday (>= 0.8.1)
   json
   kicker
   mocha-on-bacon
-  octokit (<= 1.0.3)
+  octokit
   open4
   pry
   rake

cocoapods.gemspec

@@ -28,13 +28,8 @@ Gem::Specification.new do |s|
   s.post_install_message = "[!] If this is your first time install of CocoaPods, or if " \
                            "you are upgrading, first run: $ pod setup"
 
-  # We don't want octokit to pull in faraday 0.8.0, as it prints a warning about
-  # the `system_timer` gem being needed, which isn't available on 1.9.x
-  #
-  # Once faraday 0.8.1 is released this should be resolved:
-  # https://github.com/technoweenie/faraday/pull/147
-  s.add_runtime_dependency 'faraday',   '~> 0.7.6' 
-  s.add_runtime_dependency 'octokit',   '<= 1.0.3'
+  s.add_runtime_dependency 'faraday',   '~> 0.8.1'
+  s.add_runtime_dependency 'octokit',   '~> 1.3.0'
 
   s.add_runtime_dependency 'colored',   '~> 1.2'
   s.add_runtime_dependency 'escape',    '~> 0.0.4'

examples/RKTwitter/Classes/RKTStatus.h

@@ -3,7 +3,7 @@
 //  RKTwitter
 //
 //  Created by Blake Watters on 9/5/10.
-//  Copyright 2010 Two Toasters. All rights reserved.
+//  Copyright (c) 2009-2012 RestKit. All rights reserved.
 //
 
 #import "RKTUser.h"

examples/RKTwitter/Classes/RKTStatus.m

@@ -3,7 +3,7 @@
 //  RKTwitter
 //
 //  Created by Blake Watters on 9/5/10.
-//  Copyright 2010 Two Toasters. All rights reserved.
+//  Copyright (c) 2009-2012 RestKit. All rights reserved.
 //
 
 #import "RKTStatus.h"

examples/RKTwitter/Classes/RKTUser.h

@@ -3,7 +3,7 @@
 //  RKTwitter
 //
 //  Created by Blake Watters on 9/5/10.
-//  Copyright 2010 Two Toasters. All rights reserved.
+//  Copyright (c) 2009-2012 RestKit. All rights reserved.
 //
 
 @interface RKTUser : NSObject {

examples/RKTwitter/Classes/RKTUser.m

@@ -3,7 +3,7 @@
 //  RKTwitter
 //
 //  Created by Blake Watters on 9/5/10.
-//  Copyright 2010 Two Toasters. All rights reserved.
+//  Copyright (c) 2009-2012 RestKit. All rights reserved.
 //
 
 #import "RKTUser.h"

examples/RKTwitter/Classes/RKTwitterAppDelegate.h

@@ -3,7 +3,7 @@
 //  RKTwitter
 //
 //  Created by Blake Watters on 9/5/10.
-//  Copyright Two Toasters 2010. All rights reserved.
+//  Copyright (c) 2009-2012 RestKit. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

examples/RKTwitter/Classes/RKTwitterAppDelegate.m

@@ -3,7 +3,7 @@
 //  RKTwitter
 //
 //  Created by Blake Watters on 9/5/10.
-//  Copyright Two Toasters 2010. All rights reserved.
+//  Copyright (c) 2009-2012 RestKit. All rights reserved.
 //
 
 #import <RestKit/RestKit.h>
@@ -19,11 +19,13 @@
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     RKLogConfigureByName("RestKit/Network*", RKLogLevelTrace);
+    RKLogConfigureByName("RestKit/ObjectMapping", RKLogLevelTrace);
+
     // Initialize RestKit
-	RKObjectManager* objectManager = [RKObjectManager objectManagerWithBaseURL:@"http://twitter.com"];
+    RKObjectManager* objectManager = [RKObjectManager managerWithBaseURLString:@"http://twitter.com"];
 
     // Enable automatic network activity indicator management
-    //objectManager.client.requestQueue.showsNetworkActivityIndicatorWhenBusy = YES;
+    objectManager.client.requestQueue.showsNetworkActivityIndicatorWhenBusy = YES;
 
     // Setup our object mappings
     RKObjectMapping* userMapping = [RKObjectMapping mappingForClass:[RKTUser class]];
@@ -43,15 +45,14 @@
 
     // Update date format so that we can parse Twitter dates properly
     // Wed Sep 29 15:31:08 +0000 2010
-	[statusMapping.dateFormatStrings addObject:@"E MMM d HH:mm:ss Z y"];
+    [RKObjectMapping addDefaultDateFormatterForString:@"E MMM d HH:mm:ss Z y" inTimeZone:nil];
 
-    // Register our mappings with the provider
-    [objectManager.mappingProvider setMapping:userMapping forKeyPath:@"user"];
-    [objectManager.mappingProvider setMapping:statusMapping forKeyPath:@"status"];
+    // Uncomment these lines to use XML, comment it to use JSON
+    //    objectManager.acceptMIMEType = RKMIMETypeXML;
+    //    statusMapping.rootKeyPath = @"statuses.status";
 
-    // Uncomment this to use XML, comment it to use JSON
-//  objectManager.acceptMIMEType = RKMIMETypeXML;
-//  [objectManager.mappingProvider setMapping:statusMapping forKeyPath:@"statuses.status"];
+    // Register our mappings with the provider using a resource path pattern
+    [objectManager.mappingProvider setObjectMapping:statusMapping forResourcePathPattern:@"/status/user_timeline/:username"];
 
     // Create Window and View Controllers
     RKTwitterViewController* viewController = [[[RKTwitterViewController alloc] initWithNibName:nil bundle:nil] autorelease];

examples/RKTwitter/Classes/RKTwitterViewController.h

@@ -3,7 +3,7 @@
 //  RKTwitter
 //
 //  Created by Blake Watters on 9/5/10.
-//  Copyright Two Toasters 2010. All rights reserved.
+//  Copyright (c) 2009-2012 RestKit. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

examples/RKTwitter/Classes/RKTwitterViewController.m

@@ -3,7 +3,7 @@
 //  RKTwitter
 //
 //  Created by Blake Watters on 9/5/10.
-//  Copyright Two Toasters 2010. All rights reserved.
+//  Copyright (c) 2009-2012 RestKit. All rights reserved.
 //
 
 #import "RKTwitterViewController.h"
@@ -18,14 +18,8 @@
 - (void)loadTimeline {
     // Load the object model via RestKit
     RKObjectManager* objectManager = [RKObjectManager sharedManager];
-    objectManager.client.baseURL = @"http://www.twitter.com";
-    [objectManager loadObjectsAtResourcePath:@"/status/user_timeline/RestKit" delegate:self block:^(RKObjectLoader* loader) {
-        // Twitter returns statuses as a naked array in JSON, so we instruct the loader
-        // to user the appropriate object mapping
-        if ([objectManager.acceptMIMEType isEqualToString:RKMIMETypeJSON]) {
-            loader.objectMapping = [objectManager.mappingProvider objectMappingForClass:[RKTStatus class]];
-        }
-    }];
+    objectManager.client.baseURL = [RKURL URLWithString:@"http://www.twitter.com"];
+    [objectManager loadObjectsAtResourcePath:@"/status/user_timeline/RestKit" delegate:self];
 }
 
 - (void)loadView {

examples/RKTwitter/Podfile.lock

 PODS:
-  - JSONKit (1.4)
+  - FileMD5Hash (0.0.1)
+  - ISO8601DateFormatter (0.6)
+  - JSONKit (1.5pre)
   - LibComponentLogging-Core (1.1.6)
   - LibComponentLogging-NSLog (1.0.4):
     - LibComponentLogging-Core (>= 1.1.6)
-  - RestKit/ObjectMapping/JSONKit (0.9.3):
-    - JSONKit
-    - RestKit (= 0.9.3)
-    - RestKit/ObjectMapping (= 0.9.3)
-
-DOWNLOAD_ONLY:
-  - RestKit (0.9.3)
-  - RestKit/Network (0.9.3)
-  - RestKit/ObjectMapping (0.9.3)
+  - NSData+Base64 (1.0.0)
+  - RestKit (0.10.0):
+    - RestKit/JSON (= 0.10.0)
+  - RestKit/JSON (0.10.0):
+    - RestKit/Network
+    - RestKit/ObjectMapping/CoreData
+    - RestKit/ObjectMapping/JSON
+    - RestKit/UI
+  - RestKit/Network (0.10.0):
+    - FileMD5Hash
+    - LibComponentLogging-NSLog (>= 1.0.4)
+    - SOCKit
+    - cocoa-oauth
+  - RestKit/ObjectMapping/CoreData (0.10.0):
+    - ISO8601DateFormatter (>= 0.6)
+    - RestKit/Network
+  - RestKit/ObjectMapping/JSON (0.10.0):
+    - ISO8601DateFormatter (>= 0.6)
+    - JSONKit (>= 1.5pre)
+    - RestKit/Network
+  - RestKit/UI (0.10.0):
+    - UDTableView
+  - SOCKit (1.0)
+  - UDTableView (1.0.0)
+  - cocoa-oauth (0.0.1):
+    - NSData+Base64 (~> 1.0)
 
 DEPENDENCIES:
-  - RestKit/ObjectMapping/JSONKit
+  - RestKit

examples/RKTwitter/RKTwitter.xcodeproj/xcshareddata/xcschemes/RKTwitter.xcscheme

-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
-               BuildableName = "RKTwitter.app"
-               BlueprintName = "RKTwitter"
-               ReferencedContainer = "container:RKTwitter.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
-            BuildableName = "RKTwitter.app"
-            BlueprintName = "RKTwitter"
-            ReferencedContainer = "container:RKTwitter.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
-            BuildableName = "RKTwitter.app"
-            BlueprintName = "RKTwitter"
-            ReferencedContainer = "container:RKTwitter.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
-            BuildableName = "RKTwitter.app"
-            BlueprintName = "RKTwitter"
-            ReferencedContainer = "container:RKTwitter.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

examples/RKTwitter/main.m

@@ -3,7 +3,7 @@
 //  RKTwitter
 //
 //  Created by Blake Watters on 9/5/10.
-//  Copyright Two Toasters 2010. All rights reserved.
+//  Copyright (c) 2009-2012 RestKit. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

lib/cocoapods/better_installer.rb

-module Pod
-  class DependencyInstaller
-    def initialize(sandbox)
-      @sandbox = sandbox
-    end
-    
-    def install(dependency)
-      
-    end
-  end
-end

lib/cocoapods/command/spec.rb

@@ -48,7 +48,15 @@ module Pod
 
       def create
         if repo_id_match = (@url || @name_or_url).match(/github.com\/([^\/\.]*\/[^\/\.]*)\.*/)
+          # This is to make sure Faraday doesn't warn the user about the `system_timer` gem missing.
+          old_warn, $-w = $-w, nil
+          begin
+            require 'faraday'
+          ensure
+            $-w = old_warn
+          end
           require 'octokit'
+
           repo_id = repo_id_match[1]
           data = github_data_for_template(repo_id)
           data[:name] = @name_or_url if @url

lib/cocoapods/specification.rb

@@ -217,7 +217,10 @@ module Pod
 
     def compiler_flags
       if @parent
-        chained = @compiler_flags[active_platform].clone.unshift @parent.compiler_flags[active_platform]
+        chained = @compiler_flags[active_platform].clone
+        # TODO hack to get the parent's compiler flags without it being
+        # converted to a String by Specification#compiler_flags.
+        chained.unshift @parent.instance_variable_get(:@compiler_flags)[active_platform]
       else
         chained = @compiler_flags[active_platform].clone
         chained.unshift '-fobjc-arc' if @requires_arc

lib/cocoapods/specification/statistics.rb

 require 'yaml'
+
+# This is to make sure Faraday doesn't warn the user about the `system_timer` gem missing.
+old_warn, $-w = $-w, nil
+begin
+  require 'faraday'
+ensure
+  $-w = old_warn
+end
 require 'octokit'
 
 module Pod