inline_forms_installer 7.13.12 → 7.13.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8dbea5de9afae0eac7ce75c65bcb7b024945186b7d4d0dab9398b4dd05e16f9
-  data.tar.gz: fede34b67cf22846171f752bdbefeff390dc79d2406d39153743e5bc6311ef87
+  metadata.gz: dc53f7edb26ebffb66e3d3aa0e018ba33b54795c2716c99ca02eef0ef1cdfe56
+  data.tar.gz: e8d5cc3f8f2ffd62cbce5cc54db7fd99dacc039450741305f4afa453ab7d8b61
 SHA512:
-  metadata.gz: d14f2aa54349546359d9543c607e623af3cafeffc21d4ea9e5a3cd3946e5d9f7a2b9146f3bb7bf5eaf0235750a2f99a5f0de5ddbb9554d53308d61b207e1df9a
-  data.tar.gz: 79625b1114078e2ad4aef25f5897a273f24159ca328d23e00b92a94140235017c47eac49672ad31e02debd5c969855e9fc3bbe82994ba2d15db5556b23f27805
+  metadata.gz: f9ea09854370bc3df76b4edbeb9a1c54ddb4579f327d76fa884821ab8f76b6e0f0266f99a066caff03c11784476701ea51aa05e85aaf910cc077f97eab98d3c7
+  data.tar.gz: acb61c2ef500a94995f15dbaabae511a3f05e3a87839f6ac2a59bf26314ec4226f92e5297d1d97343c67a5af0b248757ee6d0be46a1c5c19b37ab2766e2786e5

data/lib/inline_forms_installer/create_log.rb

@@ -0,0 +1,76 @@
+# -*- 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 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"] = 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 -a #{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,17 +113,65 @@ 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
 
-      say "Created #{app_name}. Before running Rails, use the app's RVM gemset and Bundler:", :green
-      say "  cd #{app_name}", :green
-      say "  rvm use .", :green
-      say "  bundle install", :green
-      say "  bundle exec rails test", :green
+      print_create_summary(app_name, log_path, started_at, install_example?)
+    end
+
+    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 print_create_summary(app_name, log_path, started_at, ran_example)
+      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 = test_summary_from_log(log_path, ran_example)
+
+      if_ver = InlineFormsInstaller.inline_forms_version
+      inst_ver = InlineFormsInstaller::VERSION
+
+      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 #{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, :test_summary_from_log
   end
 end
 

data/lib/inline_forms_installer/installer_core.rb

@@ -1,5 +1,8 @@
+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 bundle_install!
   say "- Running bundle install..."
@@ -21,7 +24,7 @@ end
 # 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
@@ -95,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
@@ -111,17 +115,13 @@ 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
 bundle_install!
 
@@ -1049,19 +1049,30 @@ 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)..."
+  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 "  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
+  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
 # 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.12"
+  VERSION = "7.13.14"
 
   # 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.12
+  version: 7.13.14
 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