Permalink
Browse files

Merge branch 'master' into dirlist

* master:
  [UIPod] Robustness against missing authors.
  Release 0.15.0
  Bump Xcodeproj.
  [Git] UI improvements.
  [Installer] Show project genration step.
  [Linter] Fix lint with local option.
  • Loading branch information...
2 parents e05cc70 + 1eb9a22 commit 3f15763dc7c373e89f126d30fe8f32ceb25ff607 @fabiopelosin fabiopelosin committed Oct 2, 2012
Showing with 20 additions and 16 deletions.
  1. +5 −1 CHANGELOG.md
  2. +9 −9 Gemfile.lock
  3. +1 −1 cocoapods.gemspec
  4. +1 −1 lib/cocoapods.rb
  5. +3 −3 lib/cocoapods/command/linter.rb
  6. +1 −1 lib/cocoapods/user_interface/ui_pod.rb
View
@@ -1,6 +1,10 @@
## Master
-[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.14.0...master) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.3.3...master)
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.15.0...master)
+
+## 0.15.0
+
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.14.0...0.15.0) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.3.3...0.3.4)
###### Enhancements
- Pod `install` will update the specs repo only if needed.
View
@@ -1,8 +1,8 @@
GIT
remote: git://github.com/CocoaPods/Xcodeproj.git
- revision: e3c513a66dee94b681588326bf1ce8ca4a30aef3
+ revision: 5a53472bf5342b2f17632fd53fa802930776406b
specs:
- xcodeproj (0.3.3)
+ xcodeproj (0.3.4)
activesupport (~> 3.2.6)
GIT
@@ -17,7 +17,7 @@ GIT
PATH
remote: .
specs:
- cocoapods (0.14.0)
+ cocoapods (0.15.0)
activesupport (~> 3.2.6)
colored (~> 1.2)
escape (~> 0.0.4)
@@ -26,7 +26,7 @@ PATH
octokit (~> 1.7)
open4 (~> 1.3.0)
rake (~> 0.9.0)
- xcodeproj (>= 0.3.3)
+ xcodeproj (>= 0.3.4)
GEM
remote: http://rubygems.org/
@@ -35,7 +35,7 @@ GEM
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.2)
- awesome_print (1.0.2)
+ awesome_print (1.1.0)
bacon (1.1.0)
coderay (1.0.7)
colored (1.2)
@@ -49,7 +49,7 @@ GEM
hashie (1.2.0)
i18n (0.6.1)
json (1.7.5)
- listen (0.5.0)
+ listen (0.5.2)
metaclass (0.0.1)
method_source (0.8)
mocha (0.11.4)
@@ -58,7 +58,7 @@ GEM
mocha (>= 0.9.8)
multi_json (1.3.6)
multipart-post (1.1.5)
- octokit (1.13.0)
+ octokit (1.15.1)
addressable (~> 2.2)
faraday (~> 0.8)
faraday_middleware (~> 0.8)
@@ -70,12 +70,12 @@ GEM
method_source (~> 0.8)
slop (~> 3.3.1)
rake (0.9.2.2)
- rb-fsevent (0.9.1)
+ rb-fsevent (0.9.2)
redcarpet (2.1.1)
slop (3.3.3)
terminal-notifier (1.4.2)
vcr (2.2.5)
- webmock (1.8.10)
+ webmock (1.8.11)
addressable (>= 2.2.7)
crack (>= 0.1.7)
yard (0.8.2.1)
View
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
s.executables = %w{ pod }
s.require_paths = %w{ lib }
- s.add_runtime_dependency 'xcodeproj', '>= 0.3.3'
+ s.add_runtime_dependency 'xcodeproj', '>= 0.3.4'
s.add_runtime_dependency 'faraday', '~> 0.8.1'
s.add_runtime_dependency 'octokit', '~> 1.7'
View
@@ -12,7 +12,7 @@
end
module Pod
- VERSION = '0.14.0'
+ VERSION = '0.15.0'
class PlainInformative < StandardError
end
@@ -122,15 +122,15 @@ def install_pod
def podfile_from_spec
name = spec.name
- podspec = file.realpath.to_s
+ podspec = file.realpath
platform = @platform
local = local?
podfile = Pod::Podfile.new do
platform(platform.to_sym, platform.deployment_target)
if (local)
- pod name, :local => '/Users/fabio/Desktop/RegexHighlightView'
+ pod name, :local => podspec.dirname.to_s
else
- pod name, :podspec => podspec
+ pod name, :podspec => podspec.to_s
end
end
podfile
@@ -42,7 +42,7 @@ def spec
end
def authors
- spec.authors.keys.to_sentence
+ spec.authors ? spec.authors.keys.to_sentence : ''
end
def homepage

0 comments on commit 3f15763

Please sign in to comment.