Merge pull request rails#50904 from williantenfen/support-comments-on-railsrc-file

Commented out lines in .railsrc file should not be treated as arguments

Author: rafaelfranca

railties/CHANGELOG.md

@@ -1,3 +1,8 @@
+*   Commented out lines in .railsrc file should not be treated as arguments when using
+    rails new generator command. Update ARGVScrubber to ignore text after # symbols.
+
+    *Willian Tenfen*
+
 *   Skip CSS when generating APIs.
 
     *Ruy Rocha*

railties/lib/rails/generators/rails/app/app_generator.rb

@@ -658,7 +658,7 @@ def railsrc(argv)
         end
 
         def read_rc_file(railsrc)
-          extra_args = File.readlines(railsrc).flat_map(&:split)
+          extra_args = File.readlines(railsrc).flat_map.each { |line| line.split("#", 2).first.split }
           puts "Using #{extra_args.join(" ")} from #{railsrc}"
           extra_args
         end

railties/test/generators/argv_scrubber_test.rb

@@ -108,6 +108,23 @@ def test_rc_whitespace_separated
         file.unlink
       end
 
+      def test_rc_lines_with_comments
+        file = Tempfile.new "myrcfile"
+        file.puts "--hello # --world"
+        file.puts "--love"
+        file.puts "# --hate"
+        file.flush
+
+        scrubber = Class.new(ARGVScrubber) {
+          define_method(:puts) { |msg| }
+        }.new ["new", "--rc=#{file.path}"]
+        args = scrubber.prepare!
+        assert_equal ["--hello", "--love"], args
+      ensure
+        file.close
+        file.unlink
+      end
+
       def test_new_rc_option
         file = Tempfile.new "myrcfile"
         file.puts "--hello-world"