stable-cli-rails 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 943a8bb18d00d40f3649f71f0de4ea5f27e3aed2fa115eee16044ab22607bf8f
-  data.tar.gz: a0537cee5a9fe8bcbe77035b1b116a2274b66b26e131039397d5d15a3ba9a105
+  metadata.gz: 6c4c6a2df62447b539c1212d98c64f9cb33744454933fac73b9c86a763c951ac
+  data.tar.gz: 9a2f9cd59e224a67013a32351ec2bea6fda1097e01abd509594192b9648cbfa5
 SHA512:
-  metadata.gz: d8de9e3bb95df90cdb1808c4bbab3116ff6930e33837a11cc123ed24fd45230a8d65114dfceb7bf242bb22f2e19dd426f7a88ea70e3433b6856a990642f1319f
-  data.tar.gz: 7cd5cc00d03b662184586237fb8ff0126ca6381b7177c61458649b7b46a5a2be222bbb6311e31fa36564e9a5d34b2776bcdab2865ba3261d648c93ad3939d73b
+  metadata.gz: 2fc9bcdc91837698b3127d656bf9837e358acb42704f71d6047d7bcbae0fdc3b14e442a7896eb34a9ca83f64cc3d3ea33295b46a478e1a62fd277f22c627d10c
+  data.tar.gz: 37a0545468ad7e1f2ca46e8e5039df4af1ecd71cee8b6d1eaaef9b6ad279969dd4bcc00abb050356113aae458229855c37ebccc8f81e1985aa09a1d9a79c8b10

data/lib/stable/cli.rb

@@ -73,31 +73,12 @@ 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 'rvm #{ruby}@#{name} do cd #{app_path} && bundle exec rails s -p #{port} >> #{log_file} 2>&1'")
       Process.detach(pid)
 
-      wait_for_port(port, timeout: 15)
+      wait_for_port(port)
       puts "✔ #{name} running at https://#{domain}"
     end
 
@@ -177,42 +158,38 @@ 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
-        '
+        cd #{app[:path]} &&
+        #{ruby_exec} bundle exec rails s -p #{port}
       CMD
 
-      pid = spawn(cmd, out: log_file, err: log_file)
+      pid = spawn(
+        'bash',
+        '-lc',
+        cmd,
+        out: log_file,
+        err: log_file
+      )
+
       Process.detach(pid)
 
       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 +476,16 @@ module Stable
       end
     end
 
-    def wait_for_port(port, timeout: 15)
+    def wait_for_port(port, timeout: 5)
       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.6
 platform: ruby
 authors:
 - Danny Simfukwe