rails-diff 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1597a0a52bb69e722c40bdd8714a79d6ab42fcef23a844484c91ca70496d7e4b
-  data.tar.gz: 92e9120a9d970073725b002ea0ae8a2144bfdc075b30ba02e637ce86fdcebee8
+  metadata.gz: 93b1be272240b33b7c9357f98d876b1816fab44a032f7f655cc3b3c65a6bc925
+  data.tar.gz: 8201af2847c96ac8bda63200fffcc9a45179f571f72fd695260422e383fee89e
 SHA512:
-  metadata.gz: 55149e9e567a6a63d6f0b6af85351d29a26af4c48ca16a8053cf46768cb883bfc16c8a908ab89e8047897194802ded032145b58d185f62772d5e81ca308d5120
-  data.tar.gz: 716c754d1e4ff11ba617007aceb4de23fdea5cae49daaeedf794f3c497ad307e02d1827c48944d3fc4621b74427e6dba76c48089d878f36141f17e15f1c7a87b
+  metadata.gz: 38ced646ec7b54baaed0a072be43cc2a78e7e15e6658363747611de84e403df14f1cfbebbec7d67732ee0c15e0d0fc5d1ac2bf8dcecafd1060ab15f4fab2fd51
+  data.tar.gz: 7e17923b6b90f24e2a8542e291862121d7f5cccd0587bf96fd28601b32d2c83234152bb98cd769a512af86076da057eaf97cdbd8fb399b7665f9123eabfc614e

data/CHANGELOG.md

@@ -1,8 +1,23 @@
 ## [Unreleased]
 
+## [0.3.0] - 2025-02-23
+
+- Allow passing options to generate the new application
+
+```sh
+rails-diff file Gemfile --new-app-options="--database=postgresql"
+```
+
+## [0.2.1] - 2025-02-22
+
+- Add missing version command
+- Consistent error messages
+- Ensure rails path exists and dependencies are installed
+
 ## [0.2.0] - 2025-02-21
 
 - Allow comparing a specific commit
+
 ```sh
 rails-diff file Dockerfile --commit 3e7640
 ```
@@ -23,6 +38,8 @@ M## [0.1.1] - 2025-02-21
 
 - Initial release
 
+[0.3.0]: https://github.com/matheusrich/rails-diff/releases/tag/v0.3.0
+[0.2.1]: https://github.com/matheusrich/rails-diff/releases/tag/v0.2.1
 [0.2.0]: https://github.com/matheusrich/rails-diff/releases/tag/v0.2.0
 [0.1.1]: https://github.com/matheusrich/rails-diff/releases/tag/v0.1.1
 [0.1.0]: https://github.com/matheusrich/rails-diff/releases/tag/v0.1.0

data/README.md

@@ -78,6 +78,16 @@ If this option is specified, the command will exit with a non-zero status code i
 Specify the commit hash you want to compare against. If not provided, the latest
 commit on main will be used by default.
 
+#### --new-app-options <options>
+
+Specify additional options to be used with the `rails new` command. This allows you to customize the generated Rails application, for example, by specifying a different database.
+
+Example:
+
+```bash
+rails-diff file Dockerfile --new-app-options="--database=postgresql"
+```
+
 ## How it works
 
 When you run the diff, it will:

data/Rakefile

@@ -6,4 +6,4 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
-task release: :spec
+task build: :spec

data/lib/rails/diff/version.rb

@@ -2,6 +2,6 @@
 
 module Rails
   module Diff
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/rails/diff.rb

@@ -14,16 +14,16 @@ module Rails
     CACHE_DIR = File.expand_path("~/.rails-diff/cache")
 
     class << self
-      def file(*files, no_cache: false, commit: nil)
+      def file(*files, no_cache: false, commit: nil, new_app_options: nil)
         clear_cache if no_cache
-        ensure_template_app_exists(commit)
+        ensure_template_app_exists(commit, new_app_options)
 
         files.filter_map { |it| diff_with_header(it) }.join("\n")
       end
 
-      def generated(generator_name, *args, no_cache: false, skip: [], commit: nil)
+      def generated(generator_name, *args, no_cache: false, skip: [], commit: nil, new_app_options: nil)
         clear_cache if no_cache
-        ensure_template_app_exists(commit)
+        ensure_template_app_exists(commit, new_app_options)
         install_app_dependencies
 
         generated_files(generator_name, *args, skip)
@@ -33,21 +33,36 @@ module Rails
 
       private
 
+      def clear_cache
+        puts "Clearing cache"
+        FileUtils.rm_rf(CACHE_DIR)
+      end
+
+      def ensure_template_app_exists(commit, new_app_options)
+        FileUtils.mkdir_p(CACHE_DIR)
+        @new_app_options = new_app_options
+        @commit = commit || latest_commit
+        return if cached_app?
+
+        create_new_rails_app
+      end
+
       def template_app_path
-        @template_app_path ||= File.join(CACHE_DIR, commit, app_name)
+        @template_app_path ||= File.join(CACHE_DIR, commit, new_app_options_hash, app_name)
       end
 
       def rails_path
-        @rails_path ||= File.join(CACHE_DIR, "rails")
+        @rails_path ||= begin
+          File.join(CACHE_DIR, "rails").tap do |path|
+            unless File.exist?(path)
+              system("git clone --depth 1 #{RAILS_REPO} #{path} >/dev/null 2>&1")
+            end
+          end
+        end
       end
 
       def app_name = @app_name ||= File.basename(Dir.pwd)
 
-      def clear_cache
-        puts "Clearing cache..."
-        FileUtils.rm_rf(CACHE_DIR)
-      end
-
       def list_files(dir, skip = [])
         Dir.glob("#{dir}/**/*", File::FNM_DOTMATCH).reject do |it|
           File.directory?(it) ||
@@ -87,7 +102,7 @@ module Rails
       def install_app_dependencies
         Dir.chdir(template_app_path) do
           unless system("bundle check >/dev/null 2>&1")
-            puts "Installing application dependencies..."
+            puts "Installing application dependencies"
             system("bundle install >/dev/null 2>&1")
           end
         end
@@ -108,21 +123,12 @@ module Rails
         ).to_s(:color).chomp
       end
 
-      def ensure_template_app_exists(commit)
-        FileUtils.mkdir_p(CACHE_DIR)
-        @commit = commit || latest_commit
-        return if cached_app?
-
-        FileUtils.rm_rf(template_app_path)
-        create_new_rails_app
-      end
-
       def cached_app?
-        File.exist?(template_app_path) && !rails_updated?
+        File.exist?(template_app_path) && !out_of_date_rails?
       end
 
-      def rails_updated?
-        return true if !File.exist?(rails_path)
+      def out_of_date_rails?
+        return true unless File.exist?(rails_path)
 
         Dir.chdir(rails_path) do
           system("git fetch origin main >/dev/null 2>&1")
@@ -139,10 +145,6 @@ module Rails
       end
 
       def create_new_rails_app
-        unless File.exist?(rails_path)
-          system("git clone --depth 1 #{RAILS_REPO} #{rails_path} >/dev/null 2>&1")
-        end
-
         Dir.chdir(rails_path) do
           checkout_rails
           generate_app
@@ -150,9 +152,15 @@ module Rails
       end
 
       def generate_app
+        FileUtils.rm_rf(template_app_path)
         Dir.chdir("railties") do
-          puts "Generating new Rails application..."
-          system("bundle exec rails new #{template_app_path} --main --skip-bundle --force --skip-test --skip-system-test --quiet")
+          unless system("bundle check >/dev/null 2>&1")
+            puts "Installing Rails dependencies"
+            system("bundle install >/dev/null 2>&1")
+          end
+
+          puts "Generating new Rails application"
+          system("bundle exec rails new #{template_app_path} --main --skip-bundle --force --skip-test --skip-system-test --quiet #{new_app_options}")
         end
       end
 
@@ -163,17 +171,24 @@ module Rails
 
       def commit = @commit
 
+      def new_app_options = @new_app_options
+
       def latest_commit
         Dir.chdir(rails_path) do
           `git rev-parse origin/main`.strip
         end
       end
+
+      def new_app_options_hash
+        Digest::SHA256.hexdigest(new_app_options.to_s)
+      end
     end
 
     class CLI < Thor
       class_option :no_cache, type: :boolean, desc: "Clear cache before running", aliases: ["--clear-cache"]
       class_option :fail_on_diff, type: :boolean, desc: "Fail if there are differences"
       class_option :commit, type: :string, desc: "Compare against a specific commit"
+      class_option :new_app_options, type: :string, desc: "Options to pass to the rails new command"
 
       def self.exit_on_failure? = true
 
@@ -181,7 +196,7 @@ module Rails
       def file(*files)
         abort "Please provide at least one file to compare" if files.empty?
 
-        diff = Rails::Diff.file(*files, no_cache: options[:no_cache], commit: options[:commit])
+        diff = Rails::Diff.file(*files, no_cache: options[:no_cache], commit: options[:commit], new_app_options: options[:new_app_options])
         return if diff.empty?
 
         options[:fail] ? abort(diff) : puts(diff)
@@ -190,11 +205,17 @@ module Rails
       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: []
       def generated(generator_name, *args)
-        diff = Rails::Diff.generated(generator_name, *args, no_cache: options[:no_cache], skip: options[:skip], commit: options[:commit])
+        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])
         return if diff.empty?
 
         options[:fail] ? abort(diff) : puts(diff)
       end
+
+      map %w[--version -v] => :__version
+      desc "--version, -v", "print the version"
+      def __version
+        puts VERSION
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rails-diff
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Matheus Richard
 bindir: exe
 cert_chain: []
-date: 2025-02-22 00:00:00.000000000 Z
+date: 2025-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails