stable-cli-rails 0.6.3 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3218e61a2bbc965b952621aadbd8eefdbe1c3d982b4a7467de087700201f7823
-  data.tar.gz: 1a401494bec7fd015c4dd21d019b39cdec1cbbd369c6cac0087f27ebf3320b70
+  metadata.gz: 943a8bb18d00d40f3649f71f0de4ea5f27e3aed2fa115eee16044ab22607bf8f
+  data.tar.gz: a0537cee5a9fe8bcbe77035b1b116a2274b66b26e131039397d5d15a3ba9a105
 SHA512:
-  metadata.gz: b7b529c7cb295c17b48104fc192af9925f1539c69a587195a3963747822f6a903846a2603242834c762ca496638b2d9f2755ca1152038d29353fb282833bd7c1
-  data.tar.gz: edcd4067681759d297021c6b845ca679c39c64af782ccfcbb290c33a4d61e4d9c23d825d3d5d8cc694d01b265e1d90c0cf4435bc32e0b83dedafe3f18d767018
+  metadata.gz: d8de9e3bb95df90cdb1808c4bbab3116ff6930e33837a11cc123ed24fd45230a8d65114dfceb7bf242bb22f2e19dd426f7a88ea70e3433b6856a990642f1319f
+  data.tar.gz: 7cd5cc00d03b662184586237fb8ff0126ca6381b7177c61458649b7b46a5a2be222bbb6311e31fa36564e9a5d34b2776bcdab2865ba3261d648c93ad3939d73b

data/lib/stable/cli.rb

@@ -71,14 +71,30 @@ module Stable
       ensure_caddy_running!
       caddy_reload
 
-      puts 'Preparing database...'
-      system("bash -lc 'rvm #{ruby}@#{name} do cd #{app_path} && bundle exec rails db:prepare'")
-
       # --- Start Rails server ---
       puts "Starting Rails server for #{name} on port #{port}..."
+
       log_file = File.join(app_path, 'log', 'stable.log')
       FileUtils.mkdir_p(File.dirname(log_file))
-      pid = spawn("bash -lc 'rvm #{ruby}@#{name} do cd #{app_path} && RAILS_ENV=development bundle exec rails s -p #{port} >> #{log_file} 2>&1'")
+
+      cmd = <<~CMD
+        bash -lc '
+          set -e
+          cd "#{app_path}"
+
+          export RAILS_ENV=development
+          export BUNDLE_GEMFILE="#{app_path}/Gemfile"
+
+          rvm #{ruby}@#{name} do bundle check || bundle install
+          rvm #{ruby}@#{name} do bundle exec rails db:prepare
+
+          exec rvm #{ruby}@#{name} do bundle exec rails s \
+            -p #{port} \
+            -b 127.0.0.1
+        '
+      CMD
+
+      pid = spawn(cmd, out: log_file, err: log_file)
       Process.detach(pid)
 
       wait_for_port(port, timeout: 15)
@@ -161,33 +177,37 @@ module Stable
       log_file = File.join(app[:path], 'log', 'stable.log')
       FileUtils.mkdir_p(File.dirname(log_file))
 
-      ruby_exec =
-        if ruby
-          if rvm_available?
-            ensure_rvm_ruby!(ruby)
-            "rvm #{ruby}@#{name} do"
-          elsif rbenv_available?
-            ensure_rbenv_ruby!(ruby)
-            "RBENV_VERSION=#{ruby}"
-          else
-            puts 'No Ruby version manager found (rvm or rbenv)'
-            return
-          end
+      if ruby
+        if rvm_available?
+          ensure_rvm_ruby!(ruby)
+          "rvm #{ruby}@#{name} do"
+        elsif rbenv_available?
+          ensure_rbenv_ruby!(ruby)
+          "RBENV_VERSION=#{ruby}"
+        else
+          puts 'No Ruby version manager found (rvm or rbenv)'
+          return
         end
+      end
 
       cmd = <<~CMD
-        cd #{app[:path]} &&
-        #{ruby_exec} RAILS_ENV=development bundle exec rails s -p #{port}
-      CMD
+        bash -lc '
+          set -e
+          cd "#{app_path}"
 
-      pid = spawn(
-        'bash',
-        '-lc',
-        cmd,
-        out: log_file,
-        err: log_file
-      )
+          export RAILS_ENV=development
+          export BUNDLE_GEMFILE="#{app_path}/Gemfile"
+
+          rvm #{ruby}@#{name} do bundle check || bundle install
+          rvm #{ruby}@#{name} do bundle exec rails db:prepare
+
+          exec rvm #{ruby}@#{name} do bundle exec rails s \
+            -p #{port} \
+            -b 127.0.0.1
+        '
+      CMD
 
+      pid = spawn(cmd, out: log_file, err: log_file)
       Process.detach(pid)
 
       generate_cert(app[:domain])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stable-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.5
 platform: ruby
 authors:
 - Danny Simfukwe