stable-cli-rails 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d85bcf8eb4e71a8dc2c0bdb7e77fd053f844c81160f5c8cdc4d6fa42194b1275
-  data.tar.gz: 0465bfad22e484c444f3c0564e54e135d7f2c83e93996af0085e9f3aa8cf1f6a
+  metadata.gz: 55e25d45106e712c1d3e9d23754150d9519e34b38d4464652c4c0a21539a0597
+  data.tar.gz: a2bb082ffeb11bf916903f7a15cc0da89a5136c33d53b3139038d7d294591f2d
 SHA512:
-  metadata.gz: 7dfdd1728588725ffdc0fda92cb367fb53323f5e6683c2c78c2b10a9ce06fef8ca5df494a11868c260f3be12d88021f0d922e88add43b97fd91a32e56432c342
-  data.tar.gz: e8e9f9cf95140ec1090130c059ebfca7087a2377136bc306a304918d0e35b1e25a3dd4c448cd99cce5a8e0eec22766298586d16ce463f2b28c6de678f1ed8d92
+  metadata.gz: 954bb6bd50281fe5a47ed03e2cead5a2c614f7786d17cdc4831c50ab798e0a6fac59dc1b98b76f3d35524be574396813444bbf3d4f60099e7e81b44846658ef4
+  data.tar.gz: 275d760d16ce88fb018f3aad059330fd05c63911aa19352b67780bd8d8680d64918583ece7e48e2eb452329c468fff3eaac5a7fdee92341425ff792421646c0b

data/lib/stable/cli.rb

@@ -14,6 +14,7 @@ module Stable
       super
       Stable::Bootstrap.run!
       ensure_dependencies!
+      dedupe_registry!
     end
 
     def self.exit_on_failure?
@@ -29,24 +30,40 @@ module Stable
       port ||= next_free_port
       app_path = File.expand_path(name)
 
+      # --- Add app to registry ---
+      domain = "#{name}.test"
+      apps = Registry.apps
+
+      app = {
+        name: name,
+        path: app_path,
+        domain: domain,
+        port: port,
+        ruby: ruby,
+        started_at: nil
+      }
+
+      apps.reject! { |a| a[:name] == name }
+      apps << app
+
       abort "Folder already exists: #{app_path}" if File.exist?(app_path)
 
       # --- Ensure RVM and Ruby ---
       ensure_rvm!
       puts "Using Ruby #{ruby} with RVM gemset #{name}..."
-      system("bash -lc 'rvm #{ruby}@#{name} --create do true'") or abort('Failed to create RVM gemset')
-
+      system("bash -lc 'rvm #{ruby}@#{name} --create do true'") or abort("Failed to create RVM gemset #{name}")
+      ruby_cmd = rvm_exec(app, ruby)
       # --- Install Rails in gemset if needed ---
       rails_version = rails || 'latest'
-      rails_check = system("bash -lc 'rvm #{ruby}@#{name} do gem list -i rails#{rails ? " -v #{rails}" : ''}'")
+      rails_check = system("bash -lc '#{ruby_cmd} gem list -i rails#{rails ? " -v #{rails}" : ''}'")
       unless rails_check
         puts "Installing Rails #{rails_version} in gemset..."
-        system("bash -lc 'rvm #{ruby}@#{name} do gem install rails #{rails ? "-v #{rails}" : ''}'") or abort('Failed to install Rails')
+        system("bash -lc '#{ruby_cmd} gem install rails #{rails ? "-v #{rails}" : ''}'") or abort('Failed to install Rails')
       end
 
       # --- Create Rails app ---
       puts "Creating Rails app #{name} (Ruby #{ruby})..."
-      system("bash -lc 'rvm #{ruby}@#{name} do rails new #{app_path}'") or abort('Rails app creation failed')
+      system("bash -lc '#{ruby_cmd} rails new #{app_path}'") or abort('Rails app creation failed')
 
       # --- Add .ruby-version and .ruby-gemset ---
       Dir.chdir(app_path) do
@@ -55,15 +72,9 @@ module Stable
 
         # --- Install gems inside gemset ---
         puts 'Running bundle install...'
-        system("bash -lc 'rvm #{ruby}@#{name} do bundle install --jobs=4 --retry=3'") or abort('bundle install failed')
+        system("bash -lc '#{ruby_cmd} bundle install --jobs=4 --retry=3'") or abort('bundle install failed')
       end
 
-      # --- Add app to registry ---
-      domain = "#{name}.test"
-      apps = Registry.apps
-      apps << { name: name, path: app_path, domain: domain, port: port, ruby: ruby }
-      Registry.save(apps)
-
       # --- Host entry & certificate ---
       add_host_entry(domain)
       generate_cert(domain) unless options[:skip_ssl]
@@ -76,15 +87,20 @@ module Stable
       log_file = File.join(app_path, 'log', 'stable.log')
       FileUtils.mkdir_p(File.dirname(log_file))
 
+      abort "Port #{port} is already in use. Choose another port." if app_running?({ port: port })
+
       pid = spawn(
         'bash',
         '-lc',
-        "cd #{app_path} && rvm #{ruby}@#{name} do bundle exec rails s -p #{port} -b 127.0.0.1",
+        "cd #{app_path} && #{ruby_cmd} bundle exec rails s -p #{port} -b 127.0.0.1",
         out: log_file,
         err: log_file
       )
       Process.detach(pid)
 
+      app[:started_at] = Time.now.to_i
+      Registry.save(apps)
+
       sleep 1.5
 
       wait_for_port(port)
@@ -111,6 +127,8 @@ module Stable
         return
       end
 
+      puts "Detected gemset: #{File.read('.ruby-gemset').strip}" if File.exist?('.ruby-gemset')
+
       apps = Registry.apps
       name = File.basename(folder)
       domain = "#{name}.test"
@@ -154,47 +172,54 @@ module Stable
     desc 'start NAME', 'Start a Rails app with its correct Ruby version'
     def start(name)
       app = Registry.apps.find { |a| a[:name] == name }
-      unless app
-        puts "No app found with name #{name}"
-        return
-      end
+      return puts("No app found with name #{name}") unless app
 
       port = app[:port] || next_free_port
       ruby = app[:ruby]
+      path = app[:path]
 
-      puts "Starting #{name} on port #{port}#{ruby ? " (Ruby #{ruby})" : ''}..."
+      if app_running?(app)
+        puts "#{name} is already running on https://#{app[:domain]} (port #{port})"
+        return
+      end
 
-      log_file = File.join(app[:path], 'log', 'stable.log')
-      FileUtils.mkdir_p(File.dirname(log_file))
+      gemset = gemset_for(app)
 
-      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
+      rvm_cmd =
+        if ruby && gemset
+          system("bash -lc 'rvm #{ruby}@#{gemset} --create do true'")
+          "rvm #{ruby}@#{gemset} do"
+        elsif ruby
+          "rvm #{ruby} do"
         end
 
+      puts "Starting #{name} on port #{port}..."
+
+      log_file = File.join(path, 'log', 'stable.log')
+      FileUtils.mkdir_p(File.dirname(log_file))
+
       pid = spawn(
         'bash',
         '-lc',
-        "cd #{app[:path]} && rvm #{ruby}@#{name} do bundle exec rails s -p #{port} -b 127.0.0.1",
+        <<~CMD,
+          cd "#{path}"
+          #{rvm_cmd} bundle exec rails s \
+            -p #{port} \
+            -b 127.0.0.1
+        CMD
         out: log_file,
         err: log_file
       )
+
       Process.detach(pid)
 
-      sleep 1.5
+      wait_for_port(port, timeout: 30)
+
+      app[:started_at] = Time.now.to_i
+      Registry.save(Registry.apps)
 
       generate_cert(app[:domain])
       update_caddyfile(app[:domain], port)
-      wait_for_port(port)
       caddy_reload
 
       puts "#{name} started on https://#{app[:domain]}"
@@ -254,8 +279,11 @@ module Stable
       puts "mkcert: #{system('which mkcert > /dev/null') ? 'yes' : 'no'}"
 
       Registry.apps.each do |app|
-        status = port_in_use?(app[:port]) ? 'running' : 'stopped'
-        puts "#{app[:name]} → Ruby #{app[:ruby] || 'default'} (#{status})"
+        state = boot_state(app)
+        ruby  = app[:ruby] || 'default'
+        port  = app[:port]
+
+        puts "#{app[:name]} → Ruby #{ruby} | port #{port} | #{state}"
       end
     end
 
@@ -481,16 +509,17 @@ module Stable
       end
     end
 
-    def wait_for_port(port, timeout: 30)
+    def wait_for_port(port, timeout: 10)
       require 'socket'
-      start_time = Time.now
+      start = Time.now
+
       loop do
         TCPSocket.new('127.0.0.1', port).close
-        break
+        return
       rescue Errno::ECONNREFUSED
-        raise "Timeout waiting for port #{port}" if Time.now - start_time > timeout
+        raise "Rails never bound port #{port}. Check log/stable.log" if Time.now - start > timeout
 
-        sleep 0.1
+        sleep 0.5
       end
     end
 
@@ -550,5 +579,45 @@ module Stable
     def ensure_rbenv_ruby!(version)
       system("rbenv versions | grep -q #{version} || rbenv install #{version}")
     end
+
+    def app_running?(app)
+      return false unless app && app[:port]
+
+      system("lsof -i tcp:#{app[:port]} -sTCP:LISTEN > /dev/null 2>&1")
+    end
+
+    def boot_state(app)
+      return 'stopped' unless app_running?(app)
+
+      if app[:started_at]
+        elapsed = Time.now.to_i - app[:started_at]
+        return "booting (#{elapsed}s)" if elapsed < 10
+      end
+
+      'running'
+    end
+
+    def dedupe_registry!
+      apps = Registry.apps
+      apps.uniq! { |a| a[:name] }
+      Registry.save(apps)
+    end
+
+    def gemset_for(app)
+      gemset_file = File.join(app[:path], '.ruby-gemset')
+      return File.read(gemset_file).strip if File.exist?(gemset_file)
+
+      nil
+    end
+
+    def rvm_exec(app, ruby)
+      gemset = gemset_for(app)
+
+      if gemset
+        "rvm #{ruby}@#{gemset} do"
+      else
+        "rvm #{ruby} do"
+      end
+    end
   end
 end

metadata

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