inline_forms_installer 7.13.13 → 7.13.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 040522701135611fb98f42262dde130ed4abf544dbcab5d61cb4bac8c4cdb381
-  data.tar.gz: 59e927280fe2d3de6d027e8adcd6ae432174225d7cf619ff26fc4b4982520864
+  metadata.gz: 319140371cfe43d88e69997ed93a4c4cc0f7c54e58c798aa07c1d8c8852889fd
+  data.tar.gz: 8920203814f2d9f501d5e6d63ab83aed04f841568c9a85af6b39153038cc6be0
 SHA512:
-  metadata.gz: 578ebcf29d67df3e127a0eff5049a8cb2799fd9abb503ac89c5487e36f11ae475d5a4cfbf37bbdd8efeb69ade61caa8d1267aa9d88ed3f74dcd008abc4d9d402
-  data.tar.gz: 95fa9bfad065ed0810f84093baa5b513a207ae2cc2fe3b5ac182b3e2baf46ae70a09a32eee095242f6f208ed3263e0fb00d38ae04d47bebd7129d2cac9b39092
+  metadata.gz: 69a36158a145eb14e7f49b01f8463d5b3bb5823c1415a77dc6965b86c3dae188a4f4f9ea201fcc79c1eb170f8e4c8838ef2e0e8e494c29b0326e1f75ea9cb778
+  data.tar.gz: 48b4b8030aa45c72b8e5c98ad90dcf95b0fd753a5902b0913e30777bea564fd8cbfa37aca25d18ade3252ecac58b4040129d652cc6024f144a30fec4c7d19de3

data/lib/inline_forms_installer/app_template.rb

@@ -1,15 +1,2 @@
-require "rvm"
-
-if RVM.current && ENV["skiprvm"] != "true"
-  RVM.chdir(File.expand_path(".")) do
-    say "Working directory is #{`pwd`}"
-    RVM.use_from_path! "."
-    rvm_gemset = %x[rvm current]
-    say "RVM GEMSET is now #{rvm_gemset}"
-    say "Installing using gemset : #{RVM.current.environment_name}", :green
-  end
-else
-  say "Installing without RVM", :green
-end
-
+# RVM gemset switch happens in installer_core.rb after .ruby-gemset is written.
 apply(File.join(__dir__, "installer_core.rb"))

data/lib/inline_forms_installer/create_log.rb

@@ -14,15 +14,45 @@ module InlineFormsInstaller
       File.expand_path(File.join(app_name, "log", basename_for(started_at)))
     end
 
+    def write_header(path, started_at: Time.now, display_path: nil)
+      FileUtils.mkdir_p(File.dirname(path))
+      shown = display_path || path
+      File.open(path, "w") do |f|
+        f.puts "=== inline_forms create install log ==="
+        f.puts "started: #{started_at.iso8601}"
+        f.puts "Install log: #{shown}"
+        f.puts ""
+      end
+    end
+
+    def append_summary(path, started_at:, duration_s:, inline_forms_version:, installer_version:, bundle_ok:, test_summary:)
+      append_section(
+        path,
+        "install summary",
+        <<~TEXT
+          finished: #{Time.now.iso8601}
+          duration: #{duration_s}s
+          inline_forms: #{inline_forms_version}
+          inline_forms_installer: #{installer_version}
+          bundle check: #{bundle_ok ? "ok" : "FAILED"}
+          tests: #{test_summary}
+          Install log: #{path}
+        TEXT
+      )
+    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_INSTALLER_LOG"] = tmp
+      ENV["INLINE_FORMS_INSTALLER_LOG_DISPLAY"] = final
       ENV["INLINE_FORMS_CREATE_STARTED_AT"] = started_at.iso8601
 
+      write_header(tmp, started_at: started_at, display_path: final)
+
       ok = system(
         "bash", "-c",
-        "#{shell_command} 2>&1 | tee #{Shellwords.escape(tmp)}; exit ${PIPESTATUS[0]}"
+        "#{shell_command} 2>&1 | tee -a #{Shellwords.escape(tmp)}; exit ${PIPESTATUS[0]}"
       )
 
       if ok && File.directory?(app_name)

data/lib/inline_forms_installer/creator.rb

@@ -129,27 +129,63 @@ module InlineFormsInstaller
         exit 1
       end
 
-      print_create_summary(app_name, log_path, started_at)
+      print_create_summary(app_name, log_path, started_at, install_example?)
     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)
+    def test_summary_from_log(log_path, ran_example)
+      return "(not run — create without --example)" unless ran_example
+      return "(install log missing)" unless log_path.to_s != "" && File.file?(log_path)
+
+      summary = File.read(log_path).lines.reverse.find { |l| l =~ /\d+ runs,/ }
+      return summary.strip if summary
+
+      "(see install log — no Minitest summary line)"
+    end
+
+    def bundle_check_ok?(app_name)
+      app_dir = File.expand_path(app_name)
+      return false unless File.directory?(app_dir)
+
+      if !options[:skiprvm] && defined?(RVM) && RVM.current
+        require "rvm"
+        RVM.chdir(app_dir) do
+          RVM.use_from_path! "."
+          system("bundle", "check", out: File::NULL, err: File::NULL)
+        end
+      else
+        Dir.chdir(app_dir) do
+          system("bundle", "check", out: File::NULL, err: File::NULL)
+        end
       end
+    end
+
+    def print_create_summary(app_name, log_path, started_at, ran_example)
+      duration = (Time.now - started_at).round(1)
+      bundle_ok = bundle_check_ok?(app_name)
+
+      test_summary = test_summary_from_log(log_path, ran_example)
+
+      if_ver = InlineFormsInstaller.inline_forms_version
+      inst_ver = InlineFormsInstaller::VERSION
 
-      test_summary = ENV["INLINE_FORMS_CREATE_TEST_SUMMARY"].to_s
-      test_summary = "(not run — create without --example)" if test_summary.empty?
+      InlineFormsInstaller::CreateLog.append_summary(
+        log_path,
+        started_at: started_at,
+        duration_s: duration,
+        inline_forms_version: if_ver,
+        installer_version: inst_ver,
+        bundle_ok: bundle_ok,
+        test_summary: test_summary
+      )
 
       say ""
       say "Install complete (#{duration}s)", :green
-      say "  inline_forms #{InlineFormsInstaller.inline_forms_version} / inline_forms_installer #{InlineFormsInstaller::VERSION}", :green
+      say "  inline_forms #{if_ver} / inline_forms_installer #{inst_ver}", :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
+    private :print_create_summary, :test_summary_from_log, :bundle_check_ok?
   end
 end
 

data/lib/inline_forms_installer/installer_core.rb

@@ -1,9 +1,20 @@
-require "open3"
+require "shellwords"
 
 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 use_app_rvm_gemset!
+  return if ENV["skiprvm"] == "true"
+  return unless (gemset = ENV["inline_forms_rvm_gemset"]).to_s != ""
+  return unless defined?(RVM) && RVM.current
+
+  require "rvm"
+  say "Working directory is #{Dir.pwd}", :green
+  RVM.use_from_path! "."
+  say "Installing using gemset: #{RVM.current.environment_name}", :green
+end
+
 def bundle_install!
   say "- Running bundle install..."
   unless system("bundle", "install")
@@ -20,11 +31,12 @@ create_file ".ruby-version", "#{ENV.fetch('ruby_version', 'ruby-4.0.4')}\n"
 if (gemset = ENV["inline_forms_rvm_gemset"]).to_s != ""
   create_file ".ruby-gemset", "#{gemset}\n"
 end
+use_app_rvm_gemset!
 
 # Rails 7 dropped --skip-gemfile, so `rails new` always writes its own Gemfile.
 # Remove it so our `create_file` below does not prompt for overwrite.
 remove_file 'Gemfile' if File.exist?('Gemfile')
-create_file 'Gemfile', "# created by inline_forms #{ENV['inline_forms_version']} on #{Date.today}\n"
+create_file 'Gemfile', "# created by inline_forms_installer #{ENV['inline_forms_installer_version']} on #{Date.today}\n"
 
 # `rails new` is invoked with whatever the system `rails` binary points at
 # (often Rails 8.x), so the generated `config/application.rb` may carry
@@ -1056,18 +1068,21 @@ if ENV['install_example'] == 'true'
   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?
+  log_path = ENV["INLINE_FORMS_INSTALLER_LOG"].to_s
+  test_cmd = if log_path != ""
+               "bundle exec rails test 2>&1 | tee -a #{Shellwords.escape(log_path)}"
+             else
+               "bundle exec rails test 2>&1"
+             end
+  test_ok = system("bash", "-c", "#{test_cmd}; exit ${PIPESTATUS[0]}")
+  abort "ERROR: bundle exec rails test failed during --example install. See #{log_path}" unless test_ok
 
   say "\nDone! Example app (Photo + Apartment + Owner) is ready.", :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 != ""
+  log_path = ENV["INLINE_FORMS_INSTALLER_LOG_DISPLAY"].to_s
+  log_path = ENV["INLINE_FORMS_INSTALLER_LOG"].to_s if log_path.empty?
+  if log_path != ""
     say "  Install log: #{log_path}", :yellow
   end
 end

data/lib/inline_forms_installer/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 module InlineFormsInstaller
-  VERSION = "7.13.13"
+  VERSION = "7.13.15"
 
   # 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.13
+  version: 7.13.15
 platform: ruby
 authors:
 - Ace Suares