stable-cli-rails 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 113a2f424d8a2c9504aa4c05a3bce4cc06b3a0db2dec2006c9294a79e8bb1540
-  data.tar.gz: 7560db7955b8265db7e7ae14a4dcb7d67a0c4b738d96530010df23d44a66b1d9
+  metadata.gz: 943a8bb18d00d40f3649f71f0de4ea5f27e3aed2fa115eee16044ab22607bf8f
+  data.tar.gz: a0537cee5a9fe8bcbe77035b1b116a2274b66b26e131039397d5d15a3ba9a105
 SHA512:
-  metadata.gz: 6c9d61943bb34d7750932ae4adc4ca6ab40c46338cc5c580287e85904219af314ea6a2a838c95548162f461f376404f22eba87f322a7a0d6807a5f54fbed6449
-  data.tar.gz: 201538f7c4268bbc719df1502d2fa1eb91a16e7b356874d37328a59b6c164947e8794a68149b5ca6c870d8e828a407c2b8beb6151060fdf031246490ed763e89
+  metadata.gz: d8de9e3bb95df90cdb1808c4bbab3116ff6930e33837a11cc123ed24fd45230a8d65114dfceb7bf242bb22f2e19dd426f7a88ea70e3433b6856a990642f1319f
+  data.tar.gz: 7cd5cc00d03b662184586237fb8ff0126ca6381b7177c61458649b7b46a5a2be222bbb6311e31fa36564e9a5d34b2776bcdab2865ba3261d648c93ad3939d73b

data/lib/stable/cli.rb

@@ -71,26 +71,26 @@ module Stable
       ensure_caddy_running!
       caddy_reload
 
-      puts 'Preparing database...'
-
-      cmd = <<~CMD
-        bash -lc '
-          cd "#{app_path}" &&
-          rvm #{ruby}@#{name} do bundle exec rails db:prepare
-        '
-      CMD
-
-      system(cmd) or abort('Database preparation failed')
-
       # --- 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))
 
       cmd = <<~CMD
         bash -lc '
-          cd "#{app_path}" &&
-          rvm #{ruby}@#{name} do RAILS_ENV=development bundle exec rails s -p #{port} -b 127.0.0.1
+          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
 
@@ -177,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.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Danny Simfukwe