Merge pull request #963 from realm/jf-theme-names

Stop hard-coding theme names
realm · Apr 30, 2018 · 4be5c30 · 4be5c30
2 parents c0ba84b + c8c5a0a
commit 4be5c30
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,10 @@
   Swift version.  
   [JP Simard](https://github.com/jpsim)
 
+* Fix jony theme selection.  
+  [John Fairhurst](https://github.com/johnfairh)
+  [#962](https://github.com/realm/jazzy/issues/962)
+
 ## 0.9.2
 
 ##### Breaking

diff --git a/lib/jazzy/config.rb b/lib/jazzy/config.rb
@@ -313,15 +313,19 @@ def expand_path(path)
       description: 'Custom HTML to inject into <head></head>.',
       default: ''
 
+    BUILTIN_THEME_DIR = Pathname(__FILE__).parent + 'themes'
+    BUILTIN_THEMES = BUILTIN_THEME_DIR.children(false).map(&:to_s)
+
     config_attr :theme_directory,
-      command_line: '--theme [apple | fullwidth | jony | DIRPATH]',
+      command_line: "--theme [#{BUILTIN_THEMES.join(' | ')} | DIRPATH]",
       description: "Which theme to use. Specify either 'apple' (default), "\
-                   "'fullwidth', 'jony' or the path to your mustache " \
-                   'templates and other assets for a custom theme.',
+                   'one of the other built-in theme names, or the path to '\
+                   'your mustache templates and other assets for a custom '\
+                   'theme.',
       default: 'apple',
       parse: ->(t) do
-        if %w[apple fullwidth].include?(t)
-          Pathname(__FILE__).parent + 'themes' + t
+        if BUILTIN_THEMES.include?(t)
+          BUILTIN_THEME_DIR + t
         else
           expand_path(t)
         end

diff --git a/spec/integration_specs b/spec/integration_specs
+295 −301		misc_jazzy_features/after/docs/Classes/ClassWithInitializers.html
+214 −220		misc_jazzy_features/after/docs/Classes/ImplicitlyInternalTopLevelClass.html
+220 −226		misc_jazzy_features/after/docs/Classes/ImplicitlyInternalTopLevelClass/NestedClass.html
+213 −219		misc_jazzy_features/after/docs/Classes/MiscMarkdown.html
+213 −219		misc_jazzy_features/after/docs/Classes/Operators_5FNamespace.html
+272 −278		misc_jazzy_features/after/docs/Classes/TopLevelClass.html
+238 −244		misc_jazzy_features/after/docs/Classes/TopLevelClass/NestedLevel1.html
+247 −253		misc_jazzy_features/after/docs/Classes/TopLevelClass/NestedLevel1/NestedLevel2.html
+278 −284		misc_jazzy_features/after/docs/Enums/DocumentedEnum.html
+213 −219		misc_jazzy_features/after/docs/Enums/UndocumentedEnum.html
+213 −219		misc_jazzy_features/after/docs/Extensions/NSObject.html
+217 −223		misc_jazzy_features/after/docs/Extensions/String.html
+213 −219		misc_jazzy_features/after/docs/Extensions/String/CharacterView.html
+183 −189		misc_jazzy_features/after/docs/Guides.html
+430 −436		misc_jazzy_features/after/docs/Other Classes.html
+217 −223		misc_jazzy_features/after/docs/Other Enums.html
+235 −241		misc_jazzy_features/after/docs/Other Extensions.html
+429 −435		misc_jazzy_features/after/docs/Other Functions.html
+216 −222		misc_jazzy_features/after/docs/Other Global Variables.html
+217 −223		misc_jazzy_features/after/docs/Other Structs.html
+213 −219		misc_jazzy_features/after/docs/Structs/GenericStruct.html
+250 −256		misc_jazzy_features/after/docs/Yang.html
+273 −279		misc_jazzy_features/after/docs/Yin.html
+227 −237		misc_jazzy_features/after/docs/css/jazzy.css
+295 −301		...after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Classes/ClassWithInitializers.html
+214 −220		.../docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Classes/ImplicitlyInternalTopLevelClass.html
+220 −226		...cJazzyFeatures.docset/Contents/Resources/Documents/Classes/ImplicitlyInternalTopLevelClass/NestedClass.html
+213 −219		...features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Classes/MiscMarkdown.html
+213 −219		...after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Classes/Operators_5FNamespace.html
+272 −278		...eatures/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Classes/TopLevelClass.html
+238 −244		.../docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Classes/TopLevelClass/NestedLevel1.html
+247 −253		.../MiscJazzyFeatures.docset/Contents/Resources/Documents/Classes/TopLevelClass/NestedLevel1/NestedLevel2.html
+278 −284		...features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Enums/DocumentedEnum.html
+213 −219		...atures/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Enums/UndocumentedEnum.html
+213 −219		..._features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Extensions/NSObject.html
+217 −223		...zy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Extensions/String.html
+213 −219		...ter/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Extensions/String/CharacterView.html
+183 −189		misc_jazzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Guides.html
+430 −436		..._jazzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Other Classes.html
+217 −223		misc_jazzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Other Enums.html
+235 −241		...zzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Other Extensions.html
+429 −435		...azzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Other Functions.html
+216 −222		...atures/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Other Global Variables.html
+217 −223		..._jazzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Other Structs.html
+213 −219		...eatures/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Structs/GenericStruct.html
+250 −256		misc_jazzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Yang.html
+273 −279		misc_jazzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Yin.html
+227 −237		misc_jazzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/css/jazzy.css
+181 −185		misc_jazzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/example-1.html
+181 −185		misc_jazzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/example-2.html
+ −		misc_jazzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/img/spinner.gif
+181 −185		misc_jazzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/index.html
+4 −0		misc_jazzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/js/jazzy.js
+0 −62		..._jazzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/js/jazzy.search.js
+0 −6		misc_jazzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/js/lunr.min.js
+0 −1,538		...zy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/js/typeahead.jquery.js
+181 −185		misc_jazzy_features/after/docs/example-1.html
+181 −185		misc_jazzy_features/after/docs/example-2.html
+ −		misc_jazzy_features/after/docs/img/spinner.gif
+181 −185		misc_jazzy_features/after/docs/index.html
+4 −0		misc_jazzy_features/after/docs/js/jazzy.js
+0 −62		misc_jazzy_features/after/docs/js/jazzy.search.js
+0 −6		misc_jazzy_features/after/docs/js/lunr.min.js
+0 −1,538		misc_jazzy_features/after/docs/js/typeahead.jquery.js
+1 −1		misc_jazzy_features/before/.jazzy.yaml