Skip to content

Commit

Permalink
Merge pull request #895 from realm/jf-testspec
Browse files Browse the repository at this point in the history
Skip test_specs found inside podspecs
  • Loading branch information
johnfairh authored Oct 21, 2017
2 parents 52bf33a + a45a5c9 commit ba81b1f
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 12 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
[Jeremy David Giesbrecht](https://github.com/SDGGiesbrecht)
[#891](https://github.com/realm/jazzy/issues/891)

* Fixed issue preventing `--podspec` from working with `test_spec`s.
[John Fairhurst](https://github.com/johnfairh)
[#894](https://github.com/realm/jazzy/issues/894)

## 0.8.4

##### Breaking
Expand Down
24 changes: 12 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ GEM
public_suffix (~> 2.0, >= 2.0.2)
ast (2.3.0)
bacon (1.2.0)
claide (1.0.1)
claide (1.0.2)
claide-plugins (0.9.2)
cork
nap
open4 (~> 1.3)
clintegracon (0.7.0)
colored (~> 1.2)
diffy
cocoapods (1.2.1)
cocoapods (1.3.1)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.1, < 2.0)
cocoapods-core (= 1.2.1)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.3.1)
cocoapods-deintegrate (>= 1.0.1, < 2.0)
cocoapods-downloader (>= 1.1.3, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -50,9 +50,9 @@ GEM
molinillo (~> 0.5.7)
nap (~> 1.0)
ruby-macho (~> 1.1)
xcodeproj (>= 1.4.4, < 2.0)
cocoapods-core (1.2.1)
activesupport (>= 4.0.2, < 5)
xcodeproj (>= 1.5.1, < 2.0)
cocoapods-core (1.3.1)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.1)
Expand All @@ -61,9 +61,9 @@ GEM
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.0.0)
cocoapods-trunk (1.2.0)
cocoapods-trunk (1.3.0)
nap (>= 0.8, < 2.0)
netrc (= 0.7.8)
netrc (~> 0.11)
cocoapods-try (1.1.0)
colored (1.2)
colored2 (3.1.2)
Expand Down Expand Up @@ -108,7 +108,7 @@ GEM
mustache (0.99.8)
nanaimo (0.2.3)
nap (1.1.0)
netrc (0.7.8)
netrc (0.11.0)
octokit (4.7.0)
sawyer (~> 0.8.0, >= 0.5.3)
open4 (1.3.4)
Expand Down Expand Up @@ -156,9 +156,9 @@ GEM
hashdiff
xcinvoke (0.3.0)
liferaft (~> 0.0.6)
xcodeproj (1.4.4)
xcodeproj (1.5.2)
CFPropertyList (~> 2.3.3)
claide (>= 1.0.1, < 2.0)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.2.3)

Expand Down
2 changes: 2 additions & 0 deletions lib/jazzy/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,8 @@ def expand_path(path)

config_attr :podspec,
command_line: '--podspec FILEPATH',
description: 'A CocoaPods Podspec that describes the Swift library to '\
'document',
parse: ->(ps) { PodspecDocumenter.create_podspec(Pathname(ps)) if ps },
default: Dir['*.podspec{,.json}'].first

Expand Down
3 changes: 3 additions & 0 deletions lib/jazzy/podspec_documenter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ def podfile
deterministic_uuids: false

[podspec, *podspec.recursive_subspecs].each do |ss|
# test_specification exists from CocoaPods 1.3.0
next if ss.respond_to?('test_specification') && ss.test_specification

ss.available_platforms.each do |p|
# Travis builds take too long when building docs for all available
# platforms for the Moya integration spec, so we just document OSX.
Expand Down

0 comments on commit ba81b1f

Please sign in to comment.