stable-cli-rails 0.6.5 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 943a8bb18d00d40f3649f71f0de4ea5f27e3aed2fa115eee16044ab22607bf8f
-  data.tar.gz: a0537cee5a9fe8bcbe77035b1b116a2274b66b26e131039397d5d15a3ba9a105
+  metadata.gz: d85bcf8eb4e71a8dc2c0bdb7e77fd053f844c81160f5c8cdc4d6fa42194b1275
+  data.tar.gz: 0465bfad22e484c444f3c0564e54e135d7f2c83e93996af0085e9f3aa8cf1f6a
 SHA512:
-  metadata.gz: d8de9e3bb95df90cdb1808c4bbab3116ff6930e33837a11cc123ed24fd45230a8d65114dfceb7bf242bb22f2e19dd426f7a88ea70e3433b6856a990642f1319f
-  data.tar.gz: 7cd5cc00d03b662184586237fb8ff0126ca6381b7177c61458649b7b46a5a2be222bbb6311e31fa36564e9a5d34b2776bcdab2865ba3261d648c93ad3939d73b
+  metadata.gz: 7dfdd1728588725ffdc0fda92cb367fb53323f5e6683c2c78c2b10a9ce06fef8ca5df494a11868c260f3be12d88021f0d922e88add43b97fd91a32e56432c342
+  data.tar.gz: e8e9f9cf95140ec1090130c059ebfca7087a2377136bc306a304918d0e35b1e25a3dd4c448cd99cce5a8e0eec22766298586d16ce463f2b28c6de678f1ed8d92

data/lib/stable/cli.rb

@@ -73,31 +73,21 @@ module Stable
 
       # --- 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 '
-          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)
+      pid = spawn(
+        'bash',
+        '-lc',
+        "cd #{app_path} && rvm #{ruby}@#{name} do bundle exec rails s -p #{port} -b 127.0.0.1",
+        out: log_file,
+        err: log_file
+      )
       Process.detach(pid)
 
-      wait_for_port(port, timeout: 15)
+      sleep 1.5
+
+      wait_for_port(port)
       puts "✔ #{name} running at https://#{domain}"
     end
 
@@ -177,42 +167,34 @@ module Stable
       log_file = File.join(app[:path], 'log', 'stable.log')
       FileUtils.mkdir_p(File.dirname(log_file))
 
-      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
+      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
         end
-      end
 
-      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)
+      pid = spawn(
+        'bash',
+        '-lc',
+        "cd #{app[:path]} && rvm #{ruby}@#{name} do bundle exec rails s -p #{port} -b 127.0.0.1",
+        out: log_file,
+        err: log_file
+      )
       Process.detach(pid)
 
+      sleep 1.5
+
       generate_cert(app[:domain])
       update_caddyfile(app[:domain], port)
-      wait_for_port(port, timeout: 15)
+      wait_for_port(port)
       caddy_reload
 
       puts "#{name} started on https://#{app[:domain]}"
@@ -499,17 +481,16 @@ module Stable
       end
     end
 
-    def wait_for_port(port, timeout: 15)
+    def wait_for_port(port, timeout: 30)
       require 'socket'
-      start = Time.now
-
+      start_time = Time.now
       loop do
         TCPSocket.new('127.0.0.1', port).close
-        return true
+        break
       rescue Errno::ECONNREFUSED
-        raise "Rails failed to start on port #{port} within #{timeout}s" if Time.now - start > timeout
+        raise "Timeout waiting for port #{port}" if Time.now - start_time > timeout
 
-        sleep 0.5
+        sleep 0.1
       end
     end
 

metadata

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