Run bundle check || bundle install after hanami install

To ensure any new Gemfile entries are installed
hanami · Nov 7, 2023 · 3c555c3 · 3c555c3
1 parent 6f91d15
commit 3c555c3
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/lib/hanami/cli/commands/gem/new.rb b/lib/hanami/cli/commands/gem/new.rb
@@ -103,7 +103,7 @@ def call(app:, head: HEAD_DEFAULT, skip_install: SKIP_INSTALL_DEFAULT, skip_asse
                   end
 
                   out.puts "Running Hanami install..."
-                  run_install_commmand!(head: head)
+                  run_install_command!(head: head)
                 end
               end
             end
@@ -116,10 +116,14 @@ def call(app:, head: HEAD_DEFAULT, skip_install: SKIP_INSTALL_DEFAULT, skip_asse
           attr_reader :generator
           attr_reader :system_call
 
-          def run_install_commmand!(head:)
+          def run_install_command!(head:)
             head_flag = head ? " --head" : ""
             bundler.exec("hanami install#{head_flag}").tap do |result|
-              raise HanamiInstallError.new(result.err) unless result.successful?
+              if result.successful?
+                bundler.exec("check").successful? || bundle.exec("install")
+              else
+                raise HanamiInstallError.new(result.err)
+              end
             end
           end
         end

diff --git a/spec/unit/hanami/cli/commands/gem/new_spec.rb b/spec/unit/hanami/cli/commands/gem/new_spec.rb
@@ -28,6 +28,11 @@
       .at_least(1)
       .and_return(successful_system_call_result)
 
+    expect(bundler).to receive(:exec)
+      .with("check")
+      .at_least(1)
+      .and_return(successful_system_call_result)
+
     app_name = "HanamiTeam"
     app = "hanami_team"
     subject.call(app: app_name)
@@ -55,6 +60,11 @@
       .with("hanami install")
       .and_return(successful_system_call_result)
 
+    expect(bundler).to receive(:exec)
+      .with("check")
+      .at_least(1)
+      .and_return(successful_system_call_result)
+
     expect(system_call).to receive(:call).with("npm", ["install"])
 
     subject.call(app: app, **kwargs)
@@ -428,6 +438,11 @@ module Types
         .with("hanami install --head")
         .and_return(successful_system_call_result)
 
+      expect(bundler).to receive(:exec)
+        .with("check")
+        .at_least(1)
+        .and_return(successful_system_call_result)
+
       subject.call(app: app, **kwargs)
 
       expect(fs.directory?(app)).to be(true)
@@ -483,6 +498,11 @@ module Types
         .with("hanami install")
         .and_return(successful_system_call_result)
 
+      expect(bundler).to receive(:exec)
+        .with("check")
+        .at_least(1)
+        .and_return(successful_system_call_result)
+
       expect(system_call).not_to receive(:call).with("npm", ["install"])
 
       subject.call(app: app, **kwargs)
@@ -535,6 +555,11 @@ module Types
       .with("hanami install")
       .and_return(successful_system_call_result)
 
+    expect(bundler).to receive(:exec)
+      .with("check")
+      .at_least(1)
+      .and_return(successful_system_call_result)
+
     subject.call(app: app)
 
     expect(fs.directory?(app)).to be(true)