Merge pull request #1113 from euglena1215/fix-check-wildcard

Fix issue with wildcard expansion in FileLoader

Author: soutaro

lib/steep/services/file_loader.rb

@@ -12,30 +12,25 @@ def each_path_in_patterns(pattern, commandline_patterns = [])
           pats = commandline_patterns.empty? ? pattern.patterns : commandline_patterns
 
           pats.each do |path|
-            absolute_path = base_dir + path
-
-            if absolute_path.file?
-              relative_path = absolute_path.relative_path_from(base_dir)
-              if pattern =~ relative_path
-                yield relative_path
-              end
-            else
-              files = if absolute_path.directory?
-                        Pathname.glob("#{absolute_path}/**/*#{pattern.ext}")
-                      else
-                        Pathname.glob(absolute_path.to_s)
-                      end
-
-              files.sort.each do |source_path|
-                if source_path.file?
-                  relative_path = source_path.relative_path_from(base_dir)
-                  unless pattern.ignore?(relative_path)
-                    yield relative_path
+            Pathname.glob((base_dir + path).to_s).each do |absolute_path|
+              if absolute_path.file?
+                relative_path = absolute_path.relative_path_from(base_dir)
+                if pattern =~ relative_path
+                  yield relative_path
+                end
+              else
+                files = Pathname.glob("#{absolute_path}/**/*#{pattern.ext}")
+
+                files.sort.each do |source_path|
+                  if source_path.file?
+                    relative_path = source_path.relative_path_from(base_dir)
+                    unless pattern.ignore?(relative_path)
+                      yield relative_path
+                    end
                   end
                 end
               end
             end
-
           end
         else
           enum_for :each_path_in_patterns, pattern, commandline_patterns

test/file_loader_test.rb

@@ -33,4 +33,34 @@ def test_each_path_in_patterns
       assert_empty loader.each_path_in_patterns(pat, ["Rakefile"]).to_a
     end
   end
+
+  def test_each_path_in_patterns_with_glob
+    in_tmpdir do
+      loader = FileLoader.new(base_dir: current_dir)
+
+      (current_dir + "lib/foo/bar").mkpath()
+      (current_dir + "lib/foo/bar/baz.rb").write("")
+      (current_dir + "lib/foo/parser.rb").write("")
+      (current_dir + "lib/foo/bar/index.html.erb").write("")
+
+      pat = Pattern.new(patterns: ["lib/*/bar"], ext: ".rb")
+
+      assert_equal [Pathname("lib/foo/bar/baz.rb")], loader.each_path_in_patterns(pat, []).to_a
+    end
+  end
+
+  def test_each_path_in_patterns_with_glob_and_ext
+    in_tmpdir do
+      loader = FileLoader.new(base_dir: current_dir)
+
+      (current_dir + "lib/foo/bar").mkpath()
+      (current_dir + "lib/foo/bar/baz.rb").write("")
+      (current_dir + "lib/foo/parser.rb").write("")
+      (current_dir + "lib/foo/bar/index.html.erb").write("")
+
+      pat = Pattern.new(patterns: ["lib/*/bar/baz.rb"], ext: ".rb")
+
+      assert_equal [Pathname("lib/foo/bar/baz.rb")], loader.each_path_in_patterns(pat, []).to_a
+    end
+  end
 end