Merge branch 'master' into pod_update

* master:
  [Git] Fix for exception in failing integration test.
  Add a link to @subdigital’s NSScreencast episode about creating a podspec.
  More cleanup using ActiveSupport's Oxford comma styling of a list.

README.md

@@ -15,7 +15,7 @@ You specify the dependencies for your project in one easy text file. CocoaPods r
 
 Ultimately, the goal is to improve discoverability of, and engagement in, third party open-source libraries, by creating a more centralized ecosystem.
 
-See the [NSScreencast episode about CocoaPods](http://nsscreencast.com/episodes/5-cocoapods) for a quick overview on how to get started, or [the wiki](https://github.com/CocoaPods/CocoaPods/wiki) for more in depth information on several topics.
+See the [NSScreencast](https://twitter.com/NSScreencast) episode about [using CocoaPods](http://nsscreencast.com/episodes/5-cocoapods) for a quick overview on how to get started or [create a Pod specification](http://nsscreencast.com/episodes/28-creating-a-cocoapod), or [the wiki](https://github.com/CocoaPods/CocoaPods/wiki) for more in depth information on several topics.
 
 Or, if you’re already using CocoaPods, you can find the changelog [here](https://github.com/CocoaPods/CocoaPods/blob/master/CHANGELOG.md), which contains an overview of the changes in recent versions.
 

lib/cocoapods/command/presenter/cocoa_pod.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/array/conversions'
+
 module Pod
   class Command
     class Presenter
@@ -27,7 +29,7 @@ def spec
         end
 
         def authors
-          oxfordify spec.authors.keys
+          spec.authors.keys.to_sentence
         end
 
         def homepage
@@ -89,13 +91,6 @@ def hash
         end
 
         private
-        def oxfordify words
-          if words.size < 3
-            words.join ' and '
-          else
-            "#{words[0..-2].join(', ')}, and #{words.last}"
-          end
-        end
 
         def distance_from_now_in_words(from_time)
           return nil unless from_time

lib/cocoapods/downloader/git.rb

@@ -78,7 +78,7 @@ def update_cache
         Dir.chdir(cache_path) do
           git! "reset --hard HEAD"
           git! "clean -d -x -f"
-          git! "pull"
+          git! "pull origin master"
         end
       end
 

lib/cocoapods/generator/documentation.rb

@@ -1,4 +1,5 @@
 require 'escape'
+require 'active_support/core_ext/array/conversions'
 
 module Pod
   module Generator
@@ -23,7 +24,7 @@ def name
 
       def company
         if @specification.authors
-          @specification.authors.keys.sort.join(', ')
+          @specification.authors.keys.sort.to_sentence
         else
           'no-company'
         end

lib/cocoapods/specification/set.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/array/conversions'
+
 module Pod
   class Specification
     class Set
@@ -13,7 +15,7 @@ def required_by(dependency, dependent_name)
         unless @required_by.empty? || dependency.requirement.satisfied_by?(Gem::Version.new(required_version.to_s))
           raise Informative, "#{dependent_name} tries to activate `#{dependency}', " \
                              "but already activated version `#{required_version}' " \
-                             "by #{@required_by.join(', ')}."
+                             "by #{@required_by.to_sentence}."
         end
         @specification = nil
         @required_by << dependent_name

spec/unit/generator/documentation_spec.rb

@@ -26,8 +26,8 @@
     @doc_installer.appledoc_options.should == [
       '--project-name', 'BananaLib 1.0',
       '--docset-desc', 'Full of chunky bananas.',
-      '--project-company', 'Banana Corp, Monkey Boy',
-      '--docset-copyright', 'Banana Corp, Monkey Boy',
+      '--project-company', 'Banana Corp and Monkey Boy',
+      '--docset-copyright', 'Banana Corp and Monkey Boy',
       '--company-id', 'org.cocoapods',
       '--ignore', '.m',
       '--keep-undocumented-objects',