Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/clarkda/Core into clarkda…
Browse files Browse the repository at this point in the history
…-master

* 'master' of https://github.com/clarkda/Core:
  typo
  [Changelog] Pod names should not begin with .
  Pod names should not being with a period -- should fix #98
  Formatting
  [Changlog] Ignore any pod directory that begins with '.'
  ignore any entry that begins with a period

Conflicts:
	CHANGELOG.md
  • Loading branch information
fabiopelosin committed Apr 7, 2014
2 parents 6c9be2b + eaf437d commit 6019412
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@

##### Enhancements

* Accept new sources for Pods when they are just redirects of the old one.
* Accept new sources for Pods when they are just redirects of the old one.
[Boris Bügling](https://github.com/neonichu)
[#101](https://github.com/CocoaPods/Core/issues/101)
[#102](https://github.com/CocoaPods/Core/pull/102)

* Show informative error message when a merge conflict is detected in a YAML file.
* Show informative error message when a merge conflict is detected in a YAML
file.
[Luis de la Rosa](https://github.com/luisdelarosa)
[#69](https://github.com/CocoaPods/Core/issues/69)
[#100](https://github.com/CocoaPods/Core/pull/100)
Expand All @@ -35,6 +36,11 @@
[#66](https://github.com/CocoaPods/Core/issues/66)
[#96](https://github.com/CocoaPods/Core/pull/96)

* Ignore any pod that begins with a `.`
[Dustin Clark](https://github.com/clarkda)
[#97](https://github.com/CocoaPods/Core/pull/97)
[#98](https://github.com/CocoaPods/Core/issues/98)

##### Bug Fixes

* Added logic to handle subspecs and platform scopes to linter check of
Expand Down
2 changes: 1 addition & 1 deletion lib/cocoapods-core/source/file_system_data_provider.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def pods
return nil unless specs_dir
specs_dir_as_string = specs_dir.to_s
Dir.entries(specs_dir).select do |entry|
valid_name = !(entry == '.' || entry == '..' || entry == '.git')
valid_name = entry[0, 1] != '.'
valid_name && File.directory?(File.join(specs_dir_as_string, entry))
end.sort
end
Expand Down
4 changes: 4 additions & 0 deletions lib/cocoapods-core/specification/linter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,10 @@ def _validate_name(n)
if spec.root.name =~ /\s/
error 'The name of a spec should not contain whitespace.'
end

if spec.root.name[0, 1] == '.'
error 'The name of a spec should not begin with a period.'
end
end
end

Expand Down

0 comments on commit 6019412

Please sign in to comment.