rails-diff 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93b1be272240b33b7c9357f98d876b1816fab44a032f7f655cc3b3c65a6bc925
-  data.tar.gz: 8201af2847c96ac8bda63200fffcc9a45179f571f72fd695260422e383fee89e
+  metadata.gz: 65e5efcc214d48f2c3d2aac80dfb88c7506b3bd559a74e2c77f31fd1388736f0
+  data.tar.gz: cd3123a08c990c068401869e18e6a8c3ad0fb54867640b42a655357d73b23a01
 SHA512:
-  metadata.gz: 38ced646ec7b54baaed0a072be43cc2a78e7e15e6658363747611de84e403df14f1cfbebbec7d67732ee0c15e0d0fc5d1ac2bf8dcecafd1060ab15f4fab2fd51
-  data.tar.gz: 7e17923b6b90f24e2a8542e291862121d7f5cccd0587bf96fd28601b32d2c83234152bb98cd769a512af86076da057eaf97cdbd8fb399b7665f9123eabfc614e
+  metadata.gz: 1177590a5fa948253de27d6169f567cd75a50dc9f840e4145b45ddc55e7e3f884c8595b0ed2a8a01911290be9eaeab34eaee670212cddd56f412b7ab1a4564ea
+  data.tar.gz: 67c3ff2090a3f81c1ff1d22e1dad2ca549b45e80588021eec5c128d0f8bede276cb8da2ffcd5719fc3a312e0be52fde112ccd37cf6a97398c6725e22dc3c2375

data/.ruby-version

@@ -0,0 +1 @@
+3.4.2

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## [Unreleased]
 
+## [0.4.0] - 2025-03-05
+
+- Respect `~/.railsrc` file when generating new rails apps (PR #4). Thanks [@marcoroth](https://github.com/marcoroth) 🎉
+- Use array version of `system` to avoid command injection.
+- Update cache keys to be shorter.
+- Improve log messages.
+
 ## [0.3.0] - 2025-02-23
 
 - Allow passing options to generate the new application
@@ -38,6 +45,7 @@ M## [0.1.1] - 2025-02-21
 
 - Initial release
 
+[0.4.0]: https://github.com/matheusrich/rails-diff/releases/tag/v0.4.0
 [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

data/lib/rails/diff/version.rb

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

data/lib/rails/diff.rb

@@ -5,13 +5,15 @@ require "rails"
 require "thor"
 require "diffy"
 require "fileutils"
+require "open3"
 
 module Rails
   module Diff
     class Error < StandardError; end
 
     RAILS_REPO = "https://github.com/rails/rails.git"
-    CACHE_DIR = File.expand_path("~/.rails-diff/cache")
+    CACHE_DIR = File.expand_path("#{ENV["HOME"]}/.rails-diff/cache")
+    RAILSRC_PATH = "#{ENV["HOME"]}/.railsrc"
 
     class << self
       def file(*files, no_cache: false, commit: nil, new_app_options: nil)
@@ -33,8 +35,23 @@ module Rails
 
       private
 
+      def system!(*cmd)
+        _, stderr, status = Open3.capture3(*cmd)
+
+        unless status.success?
+          puts "\e[1;31mCommand failed:\e[0m #{cmd.join(' ')}"
+          abort stderr
+        end
+
+        true
+      end
+
+      def info(message)
+        puts "\e[1;34minfo:\e[0m #{message}"
+      end
+
       def clear_cache
-        puts "Clearing cache"
+        info "Clearing cache"
         FileUtils.rm_rf(CACHE_DIR)
       end
 
@@ -48,19 +65,26 @@ module Rails
       end
 
       def template_app_path
-        @template_app_path ||= File.join(CACHE_DIR, commit, new_app_options_hash, app_name)
+        @template_app_path ||= File.join(CACHE_DIR, "rails-#{commit.first(10)}", rails_new_options_hash, app_name)
       end
 
       def rails_path
         @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")
+              info "Cloning Rails repository"
+              system!("git", "clone", "--depth", "1", RAILS_REPO, path)
             end
           end
         end
       end
 
+      def railsrc_options
+        return @railsrc_options if defined?(@railsrc_options)
+
+        @railsrc_options = File.read(RAILSRC_PATH).lines if File.exist?(RAILSRC_PATH)
+      end
+
       def app_name = @app_name ||= File.basename(Dir.pwd)
 
       def list_files(dir, skip = [])
@@ -82,11 +106,10 @@ module Rails
       end
 
       def generated_files(generator_name, *args, skip)
-        command = "#{generator_name} #{args.join(' ')}"
         Dir.chdir(template_app_path) do
-          system("bin/rails destroy #{command} >/dev/null 2>&1")
-          puts "Running generator: rails generate #{command}"
-          track_new_files(skip) { system("bin/rails generate #{command} > /dev/null 2>&1") }
+          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) }
             .map { |it| it.delete_prefix("#{template_app_path}/") }
         end
       end
@@ -101,9 +124,9 @@ module Rails
 
       def install_app_dependencies
         Dir.chdir(template_app_path) do
-          unless system("bundle check >/dev/null 2>&1")
-            puts "Installing application dependencies"
-            system("bundle install >/dev/null 2>&1")
+          unless system!("bundle check")
+            info "Installing application dependencies"
+            system!("bundle install")
           end
         end
       end
@@ -112,8 +135,8 @@ module Rails
         rails_file = File.join(template_app_path, file)
         repo_file = File.join(Dir.pwd, file)
 
-        return "#{file} not found in the Rails template" unless File.exist?(rails_file)
-        return "#{file} not found in your repository" unless File.exist?(repo_file)
+        return "File not found in the Rails template" unless File.exist?(rails_file)
+        return "File not found in your repository" unless File.exist?(repo_file)
 
         Diffy::Diff.new(
           rails_file,
@@ -131,7 +154,7 @@ module Rails
         return true unless File.exist?(rails_path)
 
         Dir.chdir(rails_path) do
-          system("git fetch origin main >/dev/null 2>&1")
+          system!("git fetch origin main")
           current = `git rev-parse HEAD`.strip
           latest = `git rev-parse origin/main`.strip
 
@@ -152,21 +175,24 @@ module Rails
       end
 
       def generate_app
-        FileUtils.rm_rf(template_app_path)
         Dir.chdir("railties") do
-          unless system("bundle check >/dev/null 2>&1")
-            puts "Installing Rails dependencies"
-            system("bundle install >/dev/null 2>&1")
+          unless system!("bundle check")
+            info "Installing Rails dependencies"
+            system!("bundle install")
           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}")
+          if railsrc_options
+            info "Using default options from #{RAILSRC_PATH}:\n  > #{railsrc_options.join(' ')}"
+          end
+
+          info "Generating new Rails application\n  > #{rails_new_command.join(' ')}"
+          system!(*rails_new_command)
         end
       end
 
       def checkout_rails
-        puts "Checking out Rails (at commit #{commit[0..6]})"
-        system("git checkout #{commit} >/dev/null 2>&1")
+        info "Checking out Rails (at commit #{commit[0..6]})"
+        system!("git", "checkout", commit)
       end
 
       def commit = @commit
@@ -179,9 +205,22 @@ module Rails
         end
       end
 
-      def new_app_options_hash
-        Digest::SHA256.hexdigest(new_app_options.to_s)
-      end
+      def rails_new_command = @rails_new_command ||= [
+          "bundle",
+          "exec",
+          "rails",
+          "new",
+          template_app_path,
+          "--main",
+          "--skip-bundle",
+          "--force",
+          "--quiet",
+          *rails_new_options
+        ]
+
+      def rails_new_options = @rails_new_options ||= [*new_app_options, *railsrc_options].compact
+
+      def rails_new_options_hash = Digest::MD5.hexdigest(rails_new_options.join(" "))
     end
 
     class CLI < Thor

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rails-diff
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Matheus Richard
 bindir: exe
 cert_chain: []
-date: 2025-02-23 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -62,6 +62,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rspec"
+- ".ruby-version"
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
@@ -91,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Compare Rails-generated files with the ones in your repository
 test_files: []