inline_forms_installer 7.13.11 → 7.13.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c28f4c0dd8adc114abc964fa0d7ae579c14f07ef01b00e7ae9c49817db3b3d6
-  data.tar.gz: a361b6d41eaf9a5c1a4534a52d596b8925a67f8dcf9020ff7254727818aa628b
+  metadata.gz: 040522701135611fb98f42262dde130ed4abf544dbcab5d61cb4bac8c4cdb381
+  data.tar.gz: 59e927280fe2d3de6d027e8adcd6ae432174225d7cf619ff26fc4b4982520864
 SHA512:
-  metadata.gz: ab0fab2477b0ff7748dcf23374a6ead91d574eba165b64e654e0163b4c5c0b1e340b7c218e819f164ec87c0be399277b838134ad37c3344f9d372291a5a99fbb
-  data.tar.gz: 5d4996784f073975b11ed3a0bf5d3cd3473c9804e6ac934198e6a9109a3c596b862c1aaf1bfb365b18a00f094da78a02aed091422de6b544652886f5caa64ae1
+  metadata.gz: 578ebcf29d67df3e127a0eff5049a8cb2799fd9abb503ac89c5487e36f11ae475d5a4cfbf37bbdd8efeb69ade61caa8d1267aa9d88ed3f74dcd008abc4d9d402
+  data.tar.gz: 95fa9bfad065ed0810f84093baa5b513a207ae2cc2fe3b5ac182b3e2baf46ae70a09a32eee095242f6f208ed3263e0fb00d38ae04d47bebd7129d2cac9b39092

data/lib/inline_forms_installer/create_log.rb

@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+require "fileutils"
+require "shellwords"
+
+module InlineFormsInstaller
+  module CreateLog
+    module_function
+
+    def basename_for(started_at = Time.now)
+      "inline_forms_create-#{started_at.strftime('%Y%m%d-%H%M%S')}.log"
+    end
+
+    def final_path(app_name, started_at = Time.now)
+      File.expand_path(File.join(app_name, "log", basename_for(started_at)))
+    end
+
+    def tee_rails_new(app_name, shell_command, started_at: Time.now)
+      final = final_path(app_name, started_at)
+      tmp = File.expand_path(basename_for(started_at))
+      ENV["INLINE_FORMS_INSTALLER_LOG"] = final
+      ENV["INLINE_FORMS_CREATE_STARTED_AT"] = started_at.iso8601
+
+      ok = system(
+        "bash", "-c",
+        "#{shell_command} 2>&1 | tee #{Shellwords.escape(tmp)}; exit ${PIPESTATUS[0]}"
+      )
+
+      if ok && File.directory?(app_name)
+        FileUtils.mkdir_p(File.join(app_name, "log"))
+        FileUtils.mv(tmp, final) if File.exist?(tmp)
+      elsif File.exist?(tmp)
+        FileUtils.mkdir_p(File.dirname(final))
+        FileUtils.mv(tmp, final)
+      end
+
+      [ok, final]
+    end
+
+    def append_section(path, title, body)
+      return if path.to_s.strip.empty?
+
+      FileUtils.mkdir_p(File.dirname(path))
+      File.open(path, "a") { |f| f.puts "\n=== #{title} ===\n#{body}" }
+    end
+  end
+end

data/lib/inline_forms_installer/creator.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 require "securerandom"
 require "thor"
+require_relative "create_log"
 
 module InlineFormsInstaller
   class Creator < Thor
@@ -20,7 +21,6 @@ module InlineFormsInstaller
     method_option :example, :type => :boolean, :desc => "install the example app. uses sqlite as development database"
     method_option :email, :aliases => "-e", :default => "admin@example.com", :desc => "specify admin email"
     method_option :password, :aliases => "-p", :default => "admin999", :desc => "specify admin password"
-    method_option :runtest, :aliases => "--run-test", :default => false, :desc => "run tests"
     method_option :skiprvm, :aliases => "--no-rvm", :type => :boolean, :default => false, :desc => "install inline_forms without RVM"
 
     def create(app_name)
@@ -28,10 +28,6 @@ module InlineFormsInstaller
         options[:skiprvm]
       end
 
-      def self.runtest
-        options[:runtest]
-      end
-
       def self.install_example?
         options[:example]
       end
@@ -117,11 +113,43 @@ module InlineFormsInstaller
       rails_invocation = compatible_rails ? "rails _#{compatible_rails}_" : "rails"
       say "Generating app with: #{rails_invocation} new ...", :green
 
-      unless run("#{rails_invocation} new #{app_name} -m #{app_template_file} --skip-bundle --skip-bootsnap --javascript=importmap")
+      started_at = Time.now
+      log_path = InlineFormsInstaller::CreateLog.final_path(app_name, started_at)
+      say "Install log: #{log_path}", :green
+
+      shell_cmd = [
+        rails_invocation, "new", app_name, "-m", app_template_file,
+        "--skip-bundle", "--skip-bootsnap", "--javascript=importmap"
+      ].join(" ")
+
+      ok, log_path = InlineFormsInstaller::CreateLog.tee_rails_new(app_name, shell_cmd, started_at: started_at)
+      unless ok
         say "Rails could not create the app '#{app_name}', maybe because it is a reserved word...", :red
+        say "Install log: #{log_path}", :red
         exit 1
       end
+
+      print_create_summary(app_name, log_path, started_at)
+    end
+
+    def print_create_summary(app_name, log_path, started_at)
+      duration = (Time.now - started_at).round(1)
+      bundle_ok = false
+      Dir.chdir(app_name) do
+        bundle_ok = system("bundle", "check", out: File::NULL, err: File::NULL)
+      end
+
+      test_summary = ENV["INLINE_FORMS_CREATE_TEST_SUMMARY"].to_s
+      test_summary = "(not run — create without --example)" if test_summary.empty?
+
+      say ""
+      say "Install complete (#{duration}s)", :green
+      say "  inline_forms #{InlineFormsInstaller.inline_forms_version} / inline_forms_installer #{InlineFormsInstaller::VERSION}", :green
+      say "  bundle check: #{bundle_ok ? 'ok' : 'FAILED'}", bundle_ok ? :green : :red
+      say "  tests: #{test_summary}", :green
+      say "Install log: #{log_path}", :green
     end
+    private :print_create_summary
   end
 end
 

data/lib/inline_forms_installer/installer_core.rb

@@ -1,5 +1,18 @@
+require "open3"
+
 INSTALLER_ROOT = File.expand_path(ENV.fetch("INLINE_FORMS_INSTALLER_ROOT", File.expand_path("..", __dir__)))
 INLINE_FORMS_ROOT = File.expand_path(ENV.fetch("INLINE_FORMS_ROOT", INSTALLER_ROOT))
+require File.join(INSTALLER_ROOT, "lib", "inline_forms_installer", "create_log")
+
+def bundle_install!
+  say "- Running bundle install..."
+  unless system("bundle", "install")
+    abort "ERROR: bundle install failed in #{Dir.pwd}. From the app directory run: rvm use . && bundle install"
+  end
+  unless system("bundle", "check")
+    abort "ERROR: bundle check failed (gems missing). From the app directory run: rvm use . && bundle install"
+  end
+end
 
 # Pin Ruby for the generated app (after `rails new`; do not write these files in
 # Creator before `rails new` — Rails also emits `.ruby-version` and prompts).
@@ -85,6 +98,7 @@ gem_group :development do
   gem 'capistrano', require: false
   gem 'capistrano3-unicorn'
   gem 'listen'
+  gem 'foreman'
   gem 'puma', '>= 5.0'
   gem 'rvm-capistrano', :require => false
   gem 'rvm1-capistrano3', require: false
@@ -101,19 +115,15 @@ gem_group :production do
 end
 
 say "- Running bundle..."
-run "gem install bundler"
-vh_gem_dirs = [
-  ENV["VALIDATION_HINTS_ROOT"],
-  File.expand_path("~/validation_hints"),
-  File.expand_path("~/code/validation_hints"),
-  File.expand_path("../validation_hints", INSTALLER_ROOT)
-].compact.uniq
-vh_gem = vh_gem_dirs.flat_map { |dir| Dir[File.join(dir, "validation_hints-*.gem")] }.sort.last
-if vh_gem && File.file?(vh_gem)
-  say "- Installing #{File.basename(vh_gem)} (local build; not on RubyGems yet)..."
-  run "gem install #{vh_gem} --no-document"
+run "gem install bundler --no-document"
+if (vh_root = ENV["VALIDATION_HINTS_ROOT"]) && File.directory?(vh_root)
+  vh_gem = Dir[File.join(vh_root, "validation_hints-*.gem")].sort.last
+  if vh_gem && File.file?(vh_gem)
+    say "- Installing #{File.basename(vh_gem)} from VALIDATION_HINTS_ROOT..."
+    run "gem install #{vh_gem} --no-document"
+  end
 end
-run "bundle install"
+bundle_install!
 
 say "- Dart Sass: inline_forms stylesheet entrypoints + initializer..."
 copy_file File.join(INSTALLER_ROOT, "lib/installer_templates/dartsass/inline_forms_dartsass_builds.rb"),
@@ -413,7 +423,7 @@ copy_file File.join(INLINE_FORMS_ROOT, 'lib/generators/templates/application_rec
 say "- Install ActionText..."
 run "bundle exec rails active_storage:install"
 run "bundle exec rails action_text:install:migrations"
-run "bundle install"
+bundle_install!
 
 say "- Paper_trail install..."
 # Upstream paper_trail (>= 13) detects MySQL via the live ActiveRecord connection,
@@ -1039,19 +1049,27 @@ if ENV['install_example'] == 'true'
   route 'get "apartments/name_list", to: "apartments#name_list", as: :apartment_name_list'
   route "root :to => 'apartments#index'"
 
-  say "- Adding example app regression tests (bundle exec rails test)..."
   example_tests_root = File.join(INSTALLER_ROOT, "lib/installer_templates/example_app_tests")
   Dir.glob(File.join(example_tests_root, "**", "*.rb")).sort.each do |abs|
     rel = abs.delete_prefix(example_tests_root + File::SEPARATOR).tr("\\", "/")
     create_file rel, File.read(abs)
   end
 
+  say "- Running example regression tests (bundle exec rails test)..."
+  test_out, test_status = Open3.capture2e("bundle", "exec", "rails", "test")
+  if (log_path = ENV["INLINE_FORMS_INSTALLER_LOG"]).to_s != ""
+    InlineFormsInstaller::CreateLog.append_section(log_path, "bundle exec rails test", test_out)
+  end
+  summary_line = test_out.lines.reverse.find { |l| l =~ /\d+ runs,/ }
+  ENV["INLINE_FORMS_CREATE_TEST_SUMMARY"] = summary_line&.strip || "failed (no summary line)"
+  abort "ERROR: bundle exec rails test failed during --example install.\n#{test_out}" unless test_status.success?
+
   say "\nDone! Example app (Photo + Apartment + Owner) is ready.", :yellow
-  say "  bundle exec rails test     # example regression tests", :yellow
-  say "  bundle exec rails s        # then http://localhost:3000/apartments", :yellow
-  say "  More menu → Apartment names (first 10)  # /apartments/name_list", :yellow
-  say "  More menu → Owners                       # /owners (per-owner 2 tabs)", :yellow
-  say "  Log in: #{ENV["email"]} / #{ENV["password"]}", :yellow
+  say "  cd #{File.basename(Dir.pwd)} && rvm use . && bundle exec rails s", :yellow
+  say "  http://localhost:3000/apartments — #{ENV["email"]} / #{ENV["password"]}", :yellow
+  if (log_path = ENV["INLINE_FORMS_INSTALLER_LOG"]).to_s != ""
+    say "  Install log: #{log_path}", :yellow
+  end
 end
 # done!
 say "\nDone! Now make your tables with 'bundle exec rails g inline_forms ...", :yellow

data/lib/inline_forms_installer/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 module InlineFormsInstaller
-  VERSION = "7.13.11"
+  VERSION = "7.13.13"
 
   # Written into generated apps' `.ruby-version` (must match gemspec `required_ruby_version`).
   TARGET_RUBY_VERSION = "ruby-4.0.4"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms_installer
 version: !ruby/object:Gem::Version
-  version: 7.13.11
+  version: 7.13.13
 platform: ruby
 authors:
 - Ace Suares
@@ -78,6 +78,7 @@ files:
 - inline_forms_installer.gemspec
 - lib/inline_forms_installer.rb
 - lib/inline_forms_installer/app_template.rb
+- lib/inline_forms_installer/create_log.rb
 - lib/inline_forms_installer/creator.rb
 - lib/inline_forms_installer/installer_core.rb
 - lib/inline_forms_installer/version.rb