inline_forms_installer 7.13.14 → 7.13.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc53f7edb26ebffb66e3d3aa0e018ba33b54795c2716c99ca02eef0ef1cdfe56
-  data.tar.gz: e8d5cc3f8f2ffd62cbce5cc54db7fd99dacc039450741305f4afa453ab7d8b61
+  metadata.gz: 96167ccff7679d08e833d0d7b3bcecf8b9ec9fa2f950f93a38041bfd99c21177
+  data.tar.gz: 7984f59c8a809a5e65b768f7f856c5f1cb4a4fc42171d961c181141f7e1efed5
 SHA512:
-  metadata.gz: f9ea09854370bc3df76b4edbeb9a1c54ddb4579f327d76fa884821ab8f76b6e0f0266f99a066caff03c11784476701ea51aa05e85aaf910cc077f97eab98d3c7
-  data.tar.gz: acb61c2ef500a94995f15dbaabae511a3f05e3a87839f6ac2a59bf26314ec4226f92e5297d1d97343c67a5af0b248757ee6d0be46a1c5c19b37ab2766e2786e5
+  metadata.gz: 58abafb930ddc25949d072411880a0bcf322e8dd512b5d4d82fe0bf8fb1fe93d9cd2d5521afa773995fc062bec37ac7a98d0d738a601d98b7e2b2ab6133430ea
+  data.tar.gz: 50a6a526fc398ae983955d003c1ac6317c3ffb45ea508941a3d5a182dc3c7c2aacd110bbd230449ea2129d161f28d82d6f06c3fa2a5a7b4de5ef0681e87f8472

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/creator.rb

@@ -142,12 +142,26 @@ module InlineFormsInstaller
       "(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 = false
-      Dir.chdir(app_name) do
-        bundle_ok = system("bundle", "check", out: File::NULL, err: File::NULL)
-      end
+      bundle_ok = bundle_check_ok?(app_name)
 
       test_summary = test_summary_from_log(log_path, ran_example)
 
@@ -171,7 +185,7 @@ module InlineFormsInstaller
       say "  tests: #{test_summary}", :green
       say "Install log: #{log_path}", :green
     end
-    private :print_create_summary, :test_summary_from_log
+    private :print_create_summary, :test_summary_from_log, :bundle_check_ok?
   end
 end
 

data/lib/inline_forms_installer/installer_core.rb

@@ -4,6 +4,23 @@ INSTALLER_ROOT = File.expand_path(ENV.fetch("INLINE_FORMS_INSTALLER_ROOT", File.
 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 != ""
+
+  begin
+    require "rvm"
+  rescue LoadError
+    say "rvm gem not available; skipping gemset switch", :yellow
+    return
+  end
+  return unless RVM.current
+
+  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,6 +37,7 @@ 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.

data/lib/inline_forms_installer/version.rb

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