Merge pull request #969 from realm/jf-glob-expansion

Do not unintentionally expand glob parameters
realm · May 11, 2018 · 987a6d8 · 987a6d8
2 parents 54fc957 + d68ad95
commit 987a6d8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/jazzy/config.rb b/lib/jazzy/config.rb
@@ -86,8 +86,12 @@ class << self
 
     attr_accessor :base_path
 
+    def expand_glob_path(path)
+      Pathname(path).expand_path(base_path) # nil means Pathname.pwd
+    end
+
     def expand_path(path)
-      abs_path = Pathname(path).expand_path(base_path) # nil means Pathname.pwd
+      abs_path = expand_glob_path(path)
       Pathname(Dir[abs_path][0] || abs_path) # Use existing filesystem spelling
     end
 
@@ -165,7 +169,7 @@ def expand_path(path)
                    'Supports wildcards.',
       default: [],
       parse: ->(files) do
-        Array(files).map { |f| expand_path(f).to_s }
+        Array(files).map { |f| expand_glob_path(f).to_s }
       end
 
     config_attr :included_files,
@@ -174,7 +178,7 @@ def expand_path(path)
                    'Supports wildcards.',
       default: [],
       parse: ->(files) do
-        Array(files).map { |f| expand_path(f).to_s }
+        Array(files).map { |f| expand_glob_path(f).to_s }
       end
 
     config_attr :swift_version,

diff --git a/spec/integration_specs b/spec/integration_specs
+6 −5		misc_jazzy_features/after/execution_output.txt
+1 −1		misc_jazzy_features/before/.jazzy.yaml
+4 −0		misc_jazzy_features/before/MiscJazzyFeatures.xcodeproj/project.pbxproj
+1 −0		misc_jazzy_features/before/MiscJazzyFeatures/IgnoredToo.swift