Merge pull request #16 from steve-redka/main

Add --only option

Author: MatheusRich

lib/rails/diff.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "diff/version"
+require_relative "diff/file_tracker"
 require "rails"
 require "thor"
 require "diffy"
@@ -23,12 +24,12 @@ def file(*files, no_cache: false, commit: nil, new_app_options: nil)
         files.filter_map { |it| diff_with_header(it) }.join("\n")
       end
 
-      def generated(generator_name, *args, no_cache: false, skip: [], commit: nil, new_app_options: nil)
+      def generated(generator_name, *args, no_cache: false, skip: [], only: [], commit: nil, new_app_options: nil)
         clear_cache if no_cache
         ensure_template_app_exists(commit, new_app_options)
         install_app_dependencies
 
-        generated_files(generator_name, *args, skip)
+        generated_files(generator_name, *args, skip, only)
           .map { |it| diff_with_header(it) }
           .join("\n\n")
       end
@@ -97,29 +98,11 @@ def railsrc_options
 
       def app_name = @app_name ||= File.basename(Dir.pwd)
 
-      def list_files(dir, skip = [])
-        Dir.glob("#{dir}/**/*", File::FNM_DOTMATCH).reject do |it|
-          File.directory?(it) ||
-            it.start_with?("#{dir}/.git") ||
-            it.start_with?("#{dir}/tmp") ||
-            it.start_with?("#{dir}/log") ||
-            it.start_with?("#{dir}/test") ||
-            skip.any? { |s| it.start_with?("#{dir}/#{s}") }
-        end
-      end
-
-      def track_new_files(skip)
-        files_before = list_files(template_app_path)
-        yield
-        files_after = list_files(template_app_path, skip)
-        files_after - files_before
-      end
-
-      def generated_files(generator_name, *args, skip)
+      def generated_files(generator_name, *args, skip, only)
         Dir.chdir(template_app_path) do
           system!("bin/rails", "destroy", generator_name, *args)
           info "Running generator: rails generate #{generator_name} #{args.join(' ')}"
-          track_new_files(skip) { system!("bin/rails", "generate", generator_name, *args) }
+          FileTracker.new.track_new_files(template_app_path, skip, only) { system!("bin/rails", "generate", generator_name, *args) }
             .map { |it| it.delete_prefix("#{template_app_path}/") }
         end
       end
@@ -255,9 +238,16 @@ def file(*files)
 
       desc "generated GENERATOR [args]", "Compare files that would be created by a Rails generator"
       option :skip, type: :array, desc: "Skip specific files or directories", aliases: ["-s"], default: []
+      option :only, type: :array, desc: "Only include specific files or directories", aliases: ["-o"], default: []
       def generated(generator_name, *args)
         ENV["DEBUG"] = "true" if options[:debug]
-        diff = Rails::Diff.generated(generator_name, *args, no_cache: options[:no_cache], skip: options[:skip], commit: options[:commit], new_app_options: options[:new_app_options])
+        diff = Rails::Diff.generated(generator_name, 
+                                     *args, 
+                                     no_cache: options[:no_cache], 
+                                     skip: options[:skip], 
+                                     only: options[:only],
+                                     commit: options[:commit], 
+                                     new_app_options: options[:new_app_options])
         return if diff.empty?
 
         options[:fail] ? abort(diff) : puts(diff)

lib/rails/diff/file_tracker.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class FileTracker
+    def track_new_files(template_app_path, skip, only = [])
+        files_before = list_files(template_app_path)
+        yield
+        files_after = list_files(template_app_path, skip, only)
+        files_after - files_before
+      end
+
+      private
+
+    def list_files(dir, skip = [], only = [])
+      files = Dir.glob("#{dir}/**/*", File::FNM_DOTMATCH).reject do |it|
+        File.directory?(it) ||
+        it.start_with?("#{dir}/.git") ||
+        it.start_with?("#{dir}/tmp") ||
+        it.start_with?("#{dir}/log") ||
+        it.start_with?("#{dir}/test") ||
+        skip.any? { |s| it.start_with?("#{dir}/#{s}") }
+      end
+
+      if only.any?
+        files.select { |it| only.any? { |o| it.start_with?("#{dir}/#{o}") } }
+      else
+        files
+      end
+    end
+  end

spec/integration/rails/diff/file_tracker_spec.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'rails/diff/file_tracker'
+
+RSpec.describe FileTracker do
+  context 'integration tests' do
+    let(:temp_dir) { Dir.mktmpdir }
+
+    after do
+      FileUtils.remove_entry(temp_dir)
+    end
+
+    it 'tracks newly created files' do
+      FileUtils.touch("#{temp_dir}/file1.rb")
+      file_tracker = FileTracker.new
+
+      new_files = file_tracker.track_new_files(temp_dir, []) do
+        FileUtils.touch("#{temp_dir}/file2.rb")
+        FileUtils.touch("#{temp_dir}/file3.rb")
+      end
+
+      expect(new_files).to contain_exactly("#{temp_dir}/file2.rb", "#{temp_dir}/file3.rb")
+    end
+
+    it 'excludes skipped files' do
+      FileUtils.touch("#{temp_dir}/file1.rb")
+      file_tracker = FileTracker.new
+
+      new_files = file_tracker.track_new_files(temp_dir, ['file2.rb']) do
+        FileUtils.touch("#{temp_dir}/file2.rb")
+        FileUtils.touch("#{temp_dir}/file3.rb")
+      end
+
+      expect(new_files).to contain_exactly("#{temp_dir}/file3.rb")
+    end
+
+    it 'handles files with --only option' do
+      FileUtils.touch("#{temp_dir}/file1.rb")
+      file_tracker = FileTracker.new
+      new_files = file_tracker.track_new_files(temp_dir, [], ['file2.rb']) do
+        FileUtils.touch("#{temp_dir}/file2.rb")
+        FileUtils.touch("#{temp_dir}/file3.rb")
+      end
+      expect(new_files).to contain_exactly("#{temp_dir}/file2.rb")
+    end
+
+    it 'ignores files in special directories' do
+      FileUtils.mkdir_p("#{temp_dir}/.git")
+      FileUtils.mkdir_p("#{temp_dir}/tmp")
+      FileUtils.mkdir_p("#{temp_dir}/log")
+      FileUtils.touch("#{temp_dir}/file1.rb")
+      file_tracker = FileTracker.new
+
+      new_files = file_tracker.track_new_files(temp_dir, []) do
+        FileUtils.touch("#{temp_dir}/.git/config")
+        FileUtils.touch("#{temp_dir}/tmp/cache")
+        FileUtils.touch("#{temp_dir}/log/development.log")
+        FileUtils.touch("#{temp_dir}/file2.rb")
+      end
+
+      expect(new_files).to contain_exactly("#{temp_dir}/file2.rb")
+    end
+
+    it 'handles nested directories' do
+      FileUtils.touch("#{temp_dir}/file1.rb")
+      file_tracker = FileTracker.new
+
+      new_files = file_tracker.track_new_files(temp_dir, []) do
+        FileUtils.mkdir_p("#{temp_dir}/nested/dir")
+        FileUtils.touch("#{temp_dir}/nested/file2.rb")
+        FileUtils.touch("#{temp_dir}/nested/dir/file3.rb")
+      end
+
+      expect(new_files).to contain_exactly("#{temp_dir}/nested/file2.rb", "#{temp_dir}/nested/dir/file3.rb")
+    end
+  end
+end

spec/rails/diff_spec.rb

@@ -4,4 +4,33 @@
   it "has a version number" do
     expect(Rails::Diff::VERSION).not_to be nil
   end
-end
+  
+  describe ".generated" do
+    before do
+      allow(Rails::Diff).to receive(:system!).and_return(true)
+      allow(Rails::Diff).to receive(:ensure_template_app_exists)
+      allow(Rails::Diff).to receive(:install_app_dependencies)
+      allow(Rails::Diff).to receive(:generated_files).and_return(["file1.rb", "file2.rb"])
+      allow(Rails::Diff).to receive(:diff_with_header).and_return("file1.rb diff:\n===\nDiff content")
+    end
+
+    it "returns the diff for generated files" do
+      result = Rails::Diff.generated("model", "User", no_cache: true)
+      expect(result).to include("file1.rb diff:")
+    end
+  end
+
+  describe Rails::Diff::CLI do
+    describe "#generated" do
+      before do
+        allow(Rails::Diff).to receive(:system!).and_return(true)
+        allow(Rails::Diff).to receive(:generated).and_return("file1.rb diff:\n===\nDiff content")
+      end
+
+      it "runs without error" do
+        cli = Rails::Diff::CLI.new
+        expect { cli.generated("model", "User") }.not_to raise_error
+      end
+    end
+  end
+end

spec/spec_helper.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "rails/diff"
+$LOAD_PATH.unshift(File.expand_path('../../lib', __dir__))
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure