jazzy 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d4de6485c397bd0feb5b8e6612644d5d9ab1e65
-  data.tar.gz: c5a15531eda99f16aa99db7b5f7d19159de53d8c
+  metadata.gz: 319a5e064f71871c4311e5b60e6b2a45a85d2c99
+  data.tar.gz: 6cbebd00f828e1ef1a08382a2af92e0723126cbd
 SHA512:
-  metadata.gz: 4a7ff1e6c421c32e8fd4ab654fa345f526bc9e812911063f9930964f1a86bee904397193e73e9c4a84170c9b4a49a466f6f31f7b8720adb9821e0069d2cb51bb
-  data.tar.gz: c4091c6b736b1030eb9b2a445e1bd2d141cf67efed5142ea5ececc48256529662f443c6fc4b5d8526cac3a14d8d5d8ec84530cbc175ec706b7caba41af8ba795
+  metadata.gz: 9bd0c57811ffaaf3b0f1dbf5b15441c3acc461024ac1ce5934faa78d82d049d612c7b5d93970b8a532ecbc71beadb3735d6bf53f264c01a128cbf2cc54654c80
+  data.tar.gz: de4b36d41306cc0746f21154838793efc3e95b56d86bf4ad26c911f371db0b83318b3db07e770c223007fc43c327eb9deabdc8e89cd21d3049d87c45872cb345

data/.circleci/config.yml

@@ -0,0 +1,100 @@
+aliases:
+  - &save-mac-bundler-cache
+    key: bundle_mac
+    paths:
+      - vendor/bundle
+
+  - &restore-mac-bundler-cache
+    key: bundle_mac
+
+  - &bundler-environment
+    BUNDLE_JOBS: 3
+    BUNDLE_RETRY: 3
+    BUNDLE_PATH: vendor/bundle
+
+  - &shell
+    /bin/bash --login -eo pipefail
+
+  - &set-ruby-version
+    echo "ruby-2.4" > ~/.ruby-version
+
+version: 2
+jobs:
+
+  swift:
+    macos:
+      xcode: "9.2.0"
+    environment: *bundler-environment
+    # Used to invoke chruby
+    shell: *shell
+    steps:
+      - checkout
+      - restore_cache: *restore-mac-bundler-cache
+      - run: *set-ruby-version
+      - run: bundle install
+      - run: git submodule update --init --recursive
+      - run: bundle exec rake swift_spec
+      - save_cache: *save-mac-bundler-cache
+
+  objc:
+    macos:
+      xcode: "9.2.0"
+    environment: *bundler-environment
+    # Used to invoke chruby
+    shell: *shell
+    steps:
+      - checkout
+      - restore_cache: *restore-mac-bundler-cache
+      - run: *set-ruby-version
+      - run: bundle install
+      - run: git submodule update --init --recursive
+      - run: bundle exec rake objc_spec
+      - save_cache: *save-mac-bundler-cache
+
+  cocoapods:
+    macos:
+      xcode: "9.2.0"
+    environment: *bundler-environment
+    # Used to invoke chruby
+    shell: *shell
+    steps:
+      - checkout
+      - restore_cache:
+          key: cocoapods
+      - restore_cache: *restore-mac-bundler-cache
+      - run: *set-ruby-version
+      - run: bundle install
+      - run: git submodule update --init --recursive
+      - run: bundle exec rake cocoapods_spec
+      - save_cache:
+          key: cocoapods
+          paths:
+            - ~/.cocoapods
+      - save_cache: *save-mac-bundler-cache
+
+  danger_and_rubocop:
+    docker:
+      - image: circleci/ruby:2.4-node
+        environment: *bundler-environment
+        # Used to invoke chruby
+        shell: *shell
+    steps:
+      - checkout
+      - restore_cache:
+          key: bundle_linux
+      - run: bundle install
+      - run: bundle exec danger --verbose || true
+      - run: bundle exec rake rubocop
+      - save_cache:
+          key: bundle_linux
+          paths:
+            - vendor/bundle
+
+workflows:
+  version: 2
+  workflow:
+    jobs:
+      - swift
+      - objc
+      - cocoapods
+      - danger_and_rubocop

data/.rubocop.yml

@@ -31,7 +31,7 @@ Metrics/BlockLength:
 Style/NumericPredicate:
   Enabled: false
 
-Style/IndentHeredoc:
+Layout/IndentHeredoc:
   Enabled: false
 
 # We adopted raise instead of fail.

data/CHANGELOG.md

@@ -1,3 +1,36 @@
+## 0.9.1
+
+##### Breaking
+
+* None.
+
+##### Enhancements
+
+* Added a config option (`--undocumented-text UNDOCUMENTED_TEXT`) to set the
+  default text for undocumented symbols.  
+  [Akhil Batra](https://github.com/akhillies)
+  [#913](https://github.com/realm/jazzy/issues/913)
+
+* Added a config option to hide Objective-C or Swift declarations:
+  `--hide-declarations [objc|swift]`.  
+  [Ibrahim Ulukaya](https://github.com/ulukaya)
+  [#828](https://github.com/realm/jazzy/issues/828)
+
+* Automatically use Swift or Objective-C syntax highlighting for code blocks
+  in documentation comments.  Improve Swift highlighting with latest Rouge.  
+  [John Fairhurst](https://github.com/johnfairh)
+  [#218](https://github.com/realm/jazzy/issues/218)
+
+##### Bug Fixes
+
+* Fix Swift declarations when generating Objective-C docs for generic types.  
+  [John Fairhurst](https://github.com/johnfairh)
+  [#910](https://github.com/realm/jazzy/issues/910)
+
+* Don't create documentation nodes for generic type parameters.  
+  [John Fairhurst](https://github.com/johnfairh)
+  [#878](https://github.com/realm/jazzy/issues/878)
+
 ## 0.9.0
 
 ##### Breaking

data/CONTRIBUTING.md

@@ -49,7 +49,7 @@ git push
 You'll need push access to the integration specs repo to do this. You can
 request access from one of the maintainers when filing your PR.
 
-You must have Xcode 8.3.2 installed to build the integration specs.
+You must have Xcode 9.2 installed to build the integration specs.
 
 ## Making changes to SourceKitten
 

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    jazzy (0.9.0)
+    jazzy (0.9.1)
       cocoapods (~> 1.0)
       mustache (~> 0.99)
       open4
       redcarpet (~> 3.2)
-      rouge (~> 1.5)
+      rouge (>= 2.0.6, < 4.0)
       sass (~> 3.4)
       sqlite3 (~> 1.3)
       xcinvoke (~> 0.3.0)
@@ -14,7 +14,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.5)
+    CFPropertyList (2.3.6)
     activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -96,12 +96,12 @@ GEM
     gh_inspector (1.0.3)
     git (1.3.0)
     hashdiff (0.3.7)
-    i18n (0.9.0)
+    i18n (0.9.1)
       concurrent-ruby (~> 1.0)
     kramdown (1.15.0)
     liferaft (0.0.6)
     metaclass (0.0.4)
-    minitest (5.10.3)
+    minitest (5.11.1)
     mocha (1.3.0)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.3)
@@ -130,7 +130,7 @@ GEM
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     redcarpet (3.4.0)
-    rouge (1.11.1)
+    rouge (3.1.0)
     rubocop (0.49.0)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -141,7 +141,7 @@ GEM
     ruby-macho (1.1.0)
     ruby-progressbar (1.9.0)
     safe_yaml (1.0.4)
-    sass (3.5.3)
+    sass (3.5.5)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -162,7 +162,7 @@ GEM
       hashdiff
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.5.3)
+    xcodeproj (1.5.4)
       CFPropertyList (~> 2.3.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
@@ -186,4 +186,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.15.4
+   1.16.0

data/README.md

@@ -99,6 +99,8 @@ parameters to jazzy:
 * `--framework-root ...`
 * `--sdk [iphone|watch|appletv][os|simulator]|macosx` (optional, default value
    of `macosx`)
+* `--hide-declarations [objc|swift]` (optional, hides the selected language
+   declarations)
 
 ##### Example
 
@@ -155,6 +157,7 @@ directory.
 | Example             | `--documentation=Docs/*.md` |
 | jazzy.yaml example  | `documentation: Docs/*.md` |
 
+By default, jazzy looks for one of README.md, README.markdown, README.mdown or README (in that order) in the directory from where it runs to render the index page at the root of the docs output directory.
 Using the `--documentation` option, extra markdown files can be integrated into the generated docs and sidebar navigation.
 
 Any files found matching the file pattern will be parsed and included as a document with the type 'Guide' when generated. If the files are not included using the `custom_categories` config option, they will be grouped under 'Other Guides' in the sidebar navigation.

data/Rakefile

@@ -27,13 +27,34 @@ begin
 
   desc 'Run specs'
   task :spec do
-    title 'Running Unit Tests'
+    title 'Running Tests'
+    Rake::Task['unit_spec'].invoke
+    Rake::Task['objc_spec'].invoke
+    Rake::Task['swift_spec'].invoke
+    Rake::Task['cocoapods_spec'].invoke
+    Rake::Task['rubocop'].invoke
+  end
+
+  desc 'Run unit specs'
+  task :unit_spec do
     files = FileList['spec/*_spec.rb']
       .exclude('spec/integration_spec.rb').shuffle.join(' ')
     sh "bundle exec bacon #{files}"
-    sh 'bundle exec bacon spec/integration_spec.rb'
+  end
 
-    Rake::Task['rubocop'].invoke
+  desc 'Run objc integration specs'
+  task :objc_spec do
+    sh 'JAZZY_SPEC_SUBSET=objc bundle exec bacon spec/integration_spec.rb'
+  end
+
+  desc 'Run swift integration specs'
+  task :swift_spec do
+    sh 'JAZZY_SPEC_SUBSET=swift bundle exec bacon spec/integration_spec.rb'
+  end
+
+  desc 'Run cocoapods integration specs'
+  task :cocoapods_spec do
+    sh 'JAZZY_SPEC_SUBSET=cocoapods bundle exec bacon spec/integration_spec.rb'
   end
 
   desc 'Rebuilds integration fixtures'
@@ -84,12 +105,7 @@ begin
     Dir.chdir(sk_dir) do
       `swift build -c release -Xswiftc -static-stdlib`
     end
-    build_dir = "#{sk_dir}/.build/release"
-    FileUtils.cp_r Dir["#{build_dir}/{sourcekitten,*.dylib}"], 'bin'
-    Dir["#{build_dir}/*.dylib"].each do |file|
-      system 'install_name_tool', '-change', File.expand_path(file),
-             "@loader_path/#{File.basename(file)}", 'bin/sourcekitten'
-    end
+    FileUtils.cp_r "#{sk_dir}/.build/release/sourcekitten", 'bin'
     system 'install_name_tool', '-delete_rpath',
            (Pathname(`xcrun -find swift`) + '../../lib/swift/macosx').to_s,
            'bin/sourcekitten'

data/jazzy.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'mustache', '~> 0.99'
   spec.add_runtime_dependency 'open4'
   spec.add_runtime_dependency 'redcarpet', '~> 3.2'
-  spec.add_runtime_dependency 'rouge', '~> 1.5'
+  spec.add_runtime_dependency 'rouge', ['>= 2.0.6', '< 4.0']
   spec.add_runtime_dependency 'sass', '~> 3.4'
   spec.add_runtime_dependency 'sqlite3', '~> 1.3'
   spec.add_runtime_dependency 'xcinvoke', '~> 0.3.0'

data/lib/jazzy/config.rb

@@ -92,7 +92,7 @@ module Jazzy
 
     # ──────── Build ────────
 
-    # rubocop:disable Style/AlignParameters
+    # rubocop:disable Layout/AlignParameters
 
     config_attr :output,
       description: 'Folder to output the HTML docs to',
@@ -127,6 +127,15 @@ module Jazzy
       description: 'The SDK for which your code should be built.',
       default: 'macosx'
 
+    config_attr :hide_declarations,
+      command_line: '--hide-declarations [objc|swift] ',
+      description: 'Hide declarations in the specified language. Given that ' \
+                   'generating Swift docs only generates Swift declarations, ' \
+                   'this is only really useful to display just the Swift ' \
+                   'declarations & names when generating docs for an ' \
+                   'Objective-C framework.',
+      default: ''
+
     config_attr :config_file,
       command_line: '--config PATH',
       description: ['Configuration file (.yaml or .json)',
@@ -328,7 +337,13 @@ module Jazzy
         raise '--assets-directory is deprecated: use --theme instead.'
       end
 
-    # rubocop:enable Style/AlignParameters
+    config_attr :undocumented_text,
+      command_line: '--undocumented-text UNDOCUMENTED_TEXT',
+      description: 'Default text for undocumented symbols. The default '\
+                   'is "Undocumented", put "" if no text is required',
+      default: 'Undocumented'
+
+    # rubocop:enable Style/AlignParameter
 
     def initialize
       self.class.all_config_attrs.each do |attr|

data/lib/jazzy/doc.rb

@@ -27,12 +27,16 @@ module Jazzy
       ENV['JAZZY_FAKE_VERSION'] || Jazzy::VERSION
     end
 
+    def objc_first?
+      Config.instance.objc_mode && Config.instance.hide_declarations != 'objc'
+    end
+
     def language
-      Config.instance.objc_mode ? 'Objective-C' : 'Swift'
+      objc_first? ? 'Objective-C' : 'Swift'
     end
 
     def language_stub
-      Config.instance.objc_mode ? 'objc' : 'swift'
+      objc_first? ? 'objc' : 'swift'
     end
   end
 end

data/lib/jazzy/doc_builder.rb

@@ -338,8 +338,8 @@ module Jazzy
       {
         name:                       item.name,
         abstract:                   abstract,
-        declaration:                item.declaration,
-        other_language_declaration: item.other_language_declaration,
+        declaration:                item.display_declaration,
+        other_language_declaration: item.display_other_language_declaration,
         usr:                        item.usr,
         dash_type:                  item.type.dash_type,
         github_token_url:           gh_token_url(item, source_module),
@@ -409,7 +409,7 @@ module Jazzy
       doc[:name] = doc_model.name
       doc[:kind] = doc_model.type.name
       doc[:dash_type] = doc_model.type.dash_type
-      doc[:declaration] = doc_model.declaration
+      doc[:declaration] = doc_model.display_declaration
       doc[:overview] = overview
       doc[:structure] = source_module.doc_structure
       doc[:tasks] = render_tasks(source_module, doc_model.children)

data/lib/jazzy/gem_version.rb

@@ -1,3 +1,3 @@
 module Jazzy
-  VERSION = '0.9.0'.freeze unless defined? Jazzy::VERSION
+  VERSION = '0.9.1'.freeze unless defined? Jazzy::VERSION
 end

data/lib/jazzy/highlighter.rb

@@ -3,8 +3,30 @@ require 'rouge'
 module Jazzy
   # This module helps highlight code
   module Highlighter
-    def self.highlight(source, language)
-      source && Rouge.highlight(source, language, 'html')
+    class Formatter < Rouge::Formatters::HTML
+      def initialize(language)
+        @language = language
+        super()
+      end
+
+      def stream(tokens, &b)
+        yield "<pre class=\"highlight #{@language}\"><code>"
+        super
+        yield "</code></pre>\n"
+      end
+    end
+
+    # What Rouge calls the language
+    def self.default_language
+      if Config.instance.objc_mode
+        'objective_c'
+      else
+        'swift'
+      end
+    end
+
+    def self.highlight(source, language = default_language)
+      source && Rouge.highlight(source, language, Formatter.new(language))
     end
   end
 end

data/lib/jazzy/jazzy_markdown.rb

@@ -8,6 +8,8 @@ module Jazzy
       include Redcarpet::Render::SmartyPants
       include Rouge::Plugins::Redcarpet
 
+      attr_accessor :default_language
+
       def header(text, header_level)
         text_slug = text.gsub(/[^\w]+/, '-')
                         .downcase
@@ -96,6 +98,14 @@ module Jazzy
         str << text
         str << (list_type == :ordered ? "</ol>\n" : "</ul>\n")
       end
+
+      def block_code(code, language)
+        super(code, language || default_language)
+      end
+
+      def rouge_formatter(lexer)
+        Highlighter::Formatter.new(lexer.tag)
+      end
     end
 
     REDCARPET_OPTIONS = {
@@ -161,8 +171,9 @@ module Jazzy
       @markdown ||= Redcarpet::Markdown.new(renderer, REDCARPET_OPTIONS)
     end
 
-    def self.render(markdown_text)
+    def self.render(markdown_text, default_language = nil)
       renderer.reset
+      renderer.default_language = default_language
       markdown.render(markdown_text)
     end
 

data/lib/jazzy/source_declaration.rb

@@ -56,12 +56,26 @@ module Jazzy
       name.split(/[\(\)]/) if type.objc_category?
     end
 
+    def display_declaration
+      if Config.instance.hide_declarations == 'objc'
+        other_language_declaration
+      else
+        declaration
+      end
+    end
+
+    def display_other_language_declaration
+      other_language_declaration unless
+        %w[swift objc].include? Config.instance.hide_declarations
+    end
+
     attr_accessor :file
     attr_accessor :line
     attr_accessor :column
     attr_accessor :usr
     attr_accessor :modulename
     attr_accessor :name
+    attr_accessor :objc_name
     attr_accessor :declaration
     attr_accessor :other_language_declaration
     attr_accessor :abstract

data/lib/jazzy/source_declaration/type.rb

@@ -73,7 +73,7 @@ module Jazzy
       end
 
       def should_document?
-        declaration? && !param?
+        declaration? && !param? && !generic_type_param?
       end
 
       def declaration?
@@ -104,6 +104,10 @@ module Jazzy
           kind == 'source.lang.swift.decl.var.local'
       end
 
+      def generic_type_param?
+        kind == 'source.lang.swift.decl.generic_type_param'
+      end
+
       def objc_unexposed?
         kind == 'sourcekitten.source.lang.objc.decl.unexposed'
       end

data/lib/jazzy/sourcekitten.rb

@@ -48,7 +48,11 @@ end
 module Jazzy
   # This module interacts with the sourcekitten command-line executable
   module SourceKitten
-    @undocumented_abstract = Markdown.render('Undocumented').freeze
+    def self.undocumented_abstract
+      @undocumented_abstract ||= Markdown.render(
+        Config.instance.undocumented_text,
+      ).freeze
+    end
 
     # Group root-level docs by custom categories (if any) and type
     def self.group_docs(docs)
@@ -268,10 +272,9 @@ module Jazzy
     # rubocop:enable Metrics/CyclomaticComplexity
     # rubocop:enable Metrics/PerceivedComplexity
 
-    def self.should_mark_undocumented(kind, filepath)
+    def self.should_mark_undocumented(filepath)
       source_directory = Config.instance.source_directory.to_s
-      (filepath || '').start_with?(source_directory) &&
-        kind != 'source.lang.swift.decl.generic_type_param'
+      (filepath || '').start_with?(source_directory)
     end
 
     def self.process_undocumented_token(doc, declaration)
@@ -279,13 +282,13 @@ module Jazzy
 
       filepath = doc['key.filepath']
       objc = Config.instance.objc_mode
-      if objc || should_mark_undocumented(doc['key.kind'], filepath)
+      if objc || should_mark_undocumented(filepath)
         @stats.add_undocumented(declaration)
         return nil if @skip_undocumented
-        declaration.abstract = @undocumented_abstract
+        declaration.abstract = undocumented_abstract
       else
-        comment = doc['key.doc.comment']
-        declaration.abstract = Markdown.render(comment) if comment
+        declaration.abstract = Markdown.render(doc['key.doc.comment'] || '',
+                                               Highlighter.default_language)
       end
 
       declaration
@@ -302,13 +305,11 @@ module Jazzy
     end
 
     # rubocop:disable Metrics/CyclomaticComplexity
-    # rubocop:disable Metrics/PerceivedComplexity
     def self.make_doc_info(doc, declaration)
       return unless should_document?(doc)
 
       declaration.declaration = Highlighter.highlight(
         doc['key.parsed_declaration'] || doc['key.doc.declaration'],
-        Config.instance.objc_mode ? 'objc' : 'swift',
       )
       if Config.instance.objc_mode && doc['key.swift_declaration']
         declaration.other_language_declaration = Highlighter.highlight(
@@ -320,7 +321,8 @@ module Jazzy
         return process_undocumented_token(doc, declaration)
       end
 
-      declaration.abstract = Markdown.render(doc['key.doc.comment'] || '')
+      declaration.abstract = Markdown.render(doc['key.doc.comment'] || '',
+                                             Highlighter.default_language)
       declaration.discussion = ''
       declaration.return = Markdown.rendered_returns
       declaration.parameters = parameters(doc, Markdown.rendered_parameters)
@@ -328,7 +330,6 @@ module Jazzy
       @stats.add_documented
     end
     # rubocop:enable Metrics/CyclomaticComplexity
-    # rubocop:enable Metrics/PerceivedComplexity
 
     def self.make_substructure(doc, declaration)
       declaration.children = if doc['key.substructure']
@@ -358,7 +359,14 @@ module Jazzy
         declaration.parent_in_code = parent
         declaration.type = SourceDeclaration::Type.new(doc['key.kind'])
         declaration.typename = doc['key.typename']
-        current_mark = SourceMark.new(doc['key.name']) if declaration.type.mark?
+        declaration.objc_name = doc['key.name']
+        documented_name = if Config.instance.hide_declarations == 'objc' &&
+                             doc['key.swift_name']
+                            doc['key.swift_name']
+                          else
+                            declaration.objc_name
+                          end
+        current_mark = SourceMark.new(documented_name) if declaration.type.mark?
         if declaration.type.swift_enum_case?
           # Enum "cases" are thin wrappers around enum "elements".
           declarations += make_source_declarations(
@@ -377,7 +385,7 @@ module Jazzy
         declaration.file = Pathname(doc['key.filepath']) if doc['key.filepath']
         declaration.usr = doc['key.usr']
         declaration.modulename = doc['key.modulename']
-        declaration.name = doc['key.name']
+        declaration.name = documented_name
         declaration.mark = current_mark
         declaration.access_control_level =
           SourceDeclaration::AccessControlLevel.from_doc(doc)
@@ -639,7 +647,7 @@ module Jazzy
     def self.reject_objc_types(docs)
       enums = docs.map do |doc|
         [doc, doc.children]
-      end.flatten.select { |child| child.type.objc_enum? }.map(&:name)
+      end.flatten.select { |child| child.type.objc_enum? }.map(&:objc_name)
       docs.map do |doc|
         doc.children = doc.children.reject do |child|
           child.type.objc_typedef? && enums.include?(child.name)

data/spec/integration_spec.rb

@@ -49,13 +49,16 @@ require 'colored'
 require 'CLIntegracon'
 
 require 'cocoapods'
-Pod::Config.instance.with_changes(silent: true) do
-  config = Pod::Config.instance
-  # working around a bug where `pod setup --silent` isn't silent
-  if config.sources_manager.master_repo_functional?
-    Pod::Command::Repo::Update.invoke(%w[master])
-  else
-    Pod::Command::Setup.invoke
+
+def configure_cocoapods
+  Pod::Config.instance.with_changes(silent: true) do
+    config = Pod::Config.instance
+    # working around a bug where `pod setup --silent` isn't silent
+    if config.sources_manager.master_repo_functional?
+      Pod::Command::Repo::Update.invoke(%w[master])
+    else
+      Pod::Command::Setup.invoke
+    end
   end
 end
 
@@ -130,6 +133,10 @@ describe_cli 'jazzy' do
 </script>
   HTML
 
+  spec_subset = ENV['JAZZY_SPEC_SUBSET']
+
+  # rubocop:disable Style/MultilineIfModifier
+
   describe 'jazzy objective-c' do
     describe 'Creates Realm Objective-C docs' do
       realm_version = ''
@@ -160,14 +167,9 @@ describe_cli 'jazzy' do
       behaves_like cli_spec 'misc_jazzy_objc_features',
                             '--theme fullwidth'
     end
-  end
+  end if !spec_subset || spec_subset == 'objc'
 
   describe 'jazzy swift' do
-    describe 'Creates docs for a podspec with dependencies and subspecs' do
-      behaves_like cli_spec 'document_moya_podspec',
-                            '--podspec=Moya.podspec'
-    end
-
     describe 'Creates docs with a module name, author name, project URL, ' \
       'xcodebuild options, and github info' do
       behaves_like cli_spec 'document_alamofire',
@@ -208,12 +210,20 @@ describe_cli 'jazzy' do
       behaves_like cli_spec 'document_siesta',
                             # Siesta already has Docs/
                             '--output api-docs',
-                            # Use Swift 4 rather than the specified 3.0.2
-                            '--swift-version=4'
+                            # Use Swift 4.0.2 rather than the specified 3.0.2
+                            '--swift-version=4.0.3'
     end
 
     describe 'Creates docs for Swift project with a variety of contents' do
       behaves_like cli_spec 'misc_jazzy_features'
     end
-  end
+  end if !spec_subset || spec_subset == 'swift'
+
+  describe 'jazzy cocoapods' do
+    configure_cocoapods
+    describe 'Creates docs for a podspec with dependencies and subspecs' do
+      behaves_like cli_spec 'document_moya_podspec',
+                            '--podspec=Moya.podspec'
+    end
+  end if !spec_subset || spec_subset == 'cocoapods'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jazzy
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - JP Simard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2018-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -72,16 +72,22 @@ dependencies:
   name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.6
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.6
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +167,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rubocop.yml"
@@ -173,9 +180,7 @@ files:
 - README.md
 - Rakefile
 - bin/jazzy
-- bin/libCYaml.dylib
 - bin/sourcekitten
-- circle.yml
 - images/logo.jpg
 - images/logo.sketch
 - images/realm.png
@@ -259,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Soulful docs for Swift & Objective-C.

data/circle.yml

@@ -1,12 +0,0 @@
-machine:
-  xcode:
-    version: "9.0"
-
-checkout:
-  post:
-    - git submodule update --init --recursive
-
-test:
-  override:
-    - bundle exec rake spec
-    - bundle exec danger --verbose || true