Commit 2345d550 authored by Fabio Pelosin's avatar Fabio Pelosin

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.
parents fdc3d19b be222a0a
...@@ -15,7 +15,7 @@ You specify the dependencies for your project in one easy text file. CocoaPods r ...@@ -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. 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. 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.
......
require 'active_support/core_ext/array/conversions'
module Pod module Pod
class Command class Command
class Presenter class Presenter
...@@ -27,7 +29,7 @@ module Pod ...@@ -27,7 +29,7 @@ module Pod
end end
def authors def authors
oxfordify spec.authors.keys spec.authors.keys.to_sentence
end end
def homepage def homepage
...@@ -89,13 +91,6 @@ module Pod ...@@ -89,13 +91,6 @@ module Pod
end end
private 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) def distance_from_now_in_words(from_time)
return nil unless from_time return nil unless from_time
......
...@@ -78,7 +78,7 @@ module Pod ...@@ -78,7 +78,7 @@ module Pod
Dir.chdir(cache_path) do Dir.chdir(cache_path) do
git! "reset --hard HEAD" git! "reset --hard HEAD"
git! "clean -d -x -f" git! "clean -d -x -f"
git! "pull" git! "pull origin master"
end end
end end
......
require 'escape' require 'escape'
require 'active_support/core_ext/array/conversions'
module Pod module Pod
module Generator module Generator
...@@ -23,7 +24,7 @@ module Pod ...@@ -23,7 +24,7 @@ module Pod
def company def company
if @specification.authors if @specification.authors
@specification.authors.keys.sort.join(', ') @specification.authors.keys.sort.to_sentence
else else
'no-company' 'no-company'
end end
......
require 'active_support/core_ext/array/conversions'
module Pod module Pod
class Specification class Specification
class Set class Set
...@@ -13,7 +15,7 @@ module Pod ...@@ -13,7 +15,7 @@ module Pod
unless @required_by.empty? || dependency.requirement.satisfied_by?(Gem::Version.new(required_version.to_s)) unless @required_by.empty? || dependency.requirement.satisfied_by?(Gem::Version.new(required_version.to_s))
raise Informative, "#{dependent_name} tries to activate `#{dependency}', " \ raise Informative, "#{dependent_name} tries to activate `#{dependency}', " \
"but already activated version `#{required_version}' " \ "but already activated version `#{required_version}' " \
"by #{@required_by.join(', ')}." "by #{@required_by.to_sentence}."
end end
@specification = nil @specification = nil
@required_by << dependent_name @required_by << dependent_name
......
...@@ -26,8 +26,8 @@ describe Pod::Generator::Documentation do ...@@ -26,8 +26,8 @@ describe Pod::Generator::Documentation do
@doc_installer.appledoc_options.should == [ @doc_installer.appledoc_options.should == [
'--project-name', 'BananaLib 1.0', '--project-name', 'BananaLib 1.0',
'--docset-desc', 'Full of chunky bananas.', '--docset-desc', 'Full of chunky bananas.',
'--project-company', 'Banana Corp, Monkey Boy', '--project-company', 'Banana Corp and Monkey Boy',
'--docset-copyright', 'Banana Corp, Monkey Boy', '--docset-copyright', 'Banana Corp and Monkey Boy',
'--company-id', 'org.cocoapods', '--company-id', 'org.cocoapods',
'--ignore', '.m', '--ignore', '.m',
'--keep-undocumented-objects', '--keep-undocumented-objects',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment