stable-cli-rails 0.6.7 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d85bcf8eb4e71a8dc2c0bdb7e77fd053f844c81160f5c8cdc4d6fa42194b1275
-  data.tar.gz: 0465bfad22e484c444f3c0564e54e135d7f2c83e93996af0085e9f3aa8cf1f6a
+  metadata.gz: 2d0788683f7e8f99ac96bf00779599a7003e7c2f866a5a124a0fbbbca56c7a1a
+  data.tar.gz: 2c4d7c5ae3f0ee878e9f8c85660df787c340782eef1a1ea3c9c60460180c3259
 SHA512:
-  metadata.gz: 7dfdd1728588725ffdc0fda92cb367fb53323f5e6683c2c78c2b10a9ce06fef8ca5df494a11868c260f3be12d88021f0d922e88add43b97fd91a32e56432c342
-  data.tar.gz: e8e9f9cf95140ec1090130c059ebfca7087a2377136bc306a304918d0e35b1e25a3dd4c448cd99cce5a8e0eec22766298586d16ce463f2b28c6de678f1ed8d92
+  metadata.gz: ad3f5ba69aca2cca188f8a138e370a63547cf040a6ad715509d2afe7c6347fc1ed292073b2286d63dc7e446b1728a2bca29eae7db053751325fcdb9b6ac8ac2e
+  data.tar.gz: 02670b007fef74d07357f9bbc65526c1ac8256341f4c32c0e18cac37c0e55e45ef6d96efe16b4450f222a800b6e79f185a0f5888bb810d33423d5d9fe9ca61fd

data/lib/stable/cli.rb

@@ -2,7 +2,9 @@
 
 require 'thor'
 require 'etc'
+require 'tempfile'
 require 'fileutils'
+require 'io/console'
 require_relative 'scanner'
 require_relative 'registry'
 
@@ -14,6 +16,7 @@ module Stable
       super
       Stable::Bootstrap.run!
       ensure_dependencies!
+      dedupe_registry!
     end
 
     def self.exit_on_failure?
@@ -25,28 +28,47 @@ module Stable
     method_option :rails, type: :string, desc: 'Rails version to install (optional)'
     method_option :port, type: :numeric, desc: 'Port to run Rails app on'
     method_option :skip_ssl, type: :boolean, default: false, desc: 'Skip HTTPS setup'
+    method_option :db, type: :string, desc: 'Database name to create and integrate'
+    method_option :postgres, type: :boolean, default: false, desc: 'Use Postgres for the database'
+    method_option :mysql, type: :boolean, default: false, desc: 'Use MySQL for the database'
     def new(name, ruby: RUBY_VERSION, rails: nil, port: nil)
       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,14 +77,86 @@ 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)
+      # --- Database integration ---
+      if options[:db]
+        adapter = if options[:postgres]
+                    :postgresql
+                  elsif options[:mysql]
+                    :mysql
+                  else
+                    :postgresql
+                  end
+
+        adapter == :postgresql ? 'postgresql' : 'mysql2'
+        gem_name = adapter == :postgresql ? 'pg' : 'mysql2'
+
+        gemfile_path = File.join(app_path, 'Gemfile')
+        unless File.read(gemfile_path).include?(gem_name)
+          File.open(gemfile_path, 'a') do |f|
+            f.puts "\n# Added by Stable CLI"
+            f.puts "gem '#{gem_name}'"
+          end
+          puts "✅ Added '#{gem_name}' gem to Gemfile"
+        end
+
+        # Ensure the gem is installed inside the gemset
+        system("bash -lc 'cd #{app_path} && rvm #{ruby}@#{name} do bundle install --jobs=4 --retry=3'") or abort('bundle install failed')
+
+        # --- Database setup ---
+        db = Stable::DBManager.new(options[:db], adapter: adapter)
+        creds = []
+
+        case adapter
+        when :postgresql
+          db.create
+        when :mysql
+          creds = create_mysql_db(options[:db]) # creates DB and returns creds
+          # Make sure mysql2 gem is loaded for Rails
+          system("bash -lc 'cd #{app_path} && rvm #{ruby}@#{name} do bundle exec gem list | grep mysql2'") || abort('mysql2 gem not found in gemset')
+        end
+
+        # --- Generate database.yml ---
+        db_config_path = File.join(app_path, 'config', 'database.yml')
+        base_config = {
+          'adapter' => adapter == :postgresql ? 'postgresql' : 'mysql2',
+          'encoding' => adapter == :postgresql ? 'unicode' : 'utf8mb4',
+          'pool' => 5,
+          'database' => options[:db],
+          'username' => adapter == :mysql ? creds[:user] : nil,
+          'password' => adapter == :mysql ? creds[:password] : nil,
+          'host' => 'localhost',
+          'auth_plugin' => adapter == :mysql ? 'caching_sha2_password' : ''
+        }
+
+        db_configs = {
+          'default' => base_config,
+          'development' => base_config,
+          'test' => base_config.merge('database' => "#{options[:db]}_test"),
+          'production' => base_config.merge('database' => "#{options[:db]}_prod")
+        }
+
+        File.write(db_config_path, db_configs.to_yaml)
+        puts "✅ Database '#{db.name}' configured in Rails app"
+
+        # --- Prepare the database ---
+        puts 'Preparing database...'
+        system("bash -lc 'cd #{app_path} && rvm #{ruby}@#{name} do bundle exec rails db:prepare'") or abort('Database preparation failed')
+      end
+
+      # --- Generate Caddyfile ---
+
+      puts 'Refreshing bundle environment...'
+      system(
+        "bash -lc 'cd #{app_path} && #{ruby_cmd} bundle check || #{ruby_cmd} bundle install'"
+      ) or abort('Bundler setup failed')
+
+      puts 'Preparing database...'
+      system(
+        "bash -lc 'cd #{app_path} && #{ruby_cmd} bundle exec rails db:prepare'"
+      ) or abort('Database preparation failed')
 
       # --- Host entry & certificate ---
       add_host_entry(domain)
@@ -76,15 +170,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 +210,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 +255,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 +362,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
 
@@ -384,18 +495,37 @@ module Stable
         exit 1
       end
 
+      # --- Install Caddy ---
       unless system('which caddy > /dev/null')
         puts 'Installing Caddy...'
         system('brew install caddy')
       end
 
-      return if system('which mkcert > /dev/null')
+      # --- Install mkcert ---
+      unless system('which mkcert > /dev/null')
+        puts 'Installing mkcert...'
+        system('brew install mkcert nss')
+        system('mkcert -install')
+      end
 
-      puts 'Installing mkcert...'
-      system('brew install mkcert nss')
-      system('mkcert -install')
+      # --- Install PostgreSQL ---
+      unless system('which psql > /dev/null')
+        puts 'Installing PostgreSQL...'
+        system('brew install postgresql')
+        system('brew services start postgresql')
+      end
+
+      # --- Install MySQL ---
+      unless system('which mysql > /dev/null')
+        puts 'Installing MySQL...'
+        system('brew install mysql')
+        system('brew services start mysql')
+      end
+
+      puts '✅ All dependencies are installed and running.'
     end
 
+
     def ensure_caddy_running!
       api_port = 2019
 
@@ -481,16 +611,17 @@ module Stable
       end
     end
 
-    def wait_for_port(port, timeout: 30)
+    def wait_for_port(port, timeout: 20)
       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 +681,78 @@ 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
+
+    def create_mysql_db(db_name)
+      socket = %w[
+        /opt/homebrew/var/mysql/mysql.sock
+        /tmp/mysql.sock
+      ].find { |path| File.exist?(path) } || abort('MySQL socket not found')
+
+      print 'Enter MySQL root username (default: root): '
+      root_user = $stdin.gets.chomp
+      root_user = 'root' if root_user.empty?
+
+      print 'Enter MySQL root password (leave blank if none): '
+      root_password = $stdin.noecho(&:gets).chomp
+      puts
+
+      password_arg = root_password.empty? ? '' : "-p#{root_password}"
+
+      sql = <<~SQL
+        CREATE DATABASE IF NOT EXISTS #{db_name};
+        FLUSH PRIVILEGES;
+      SQL
+
+      require 'tempfile'
+      Tempfile.create(['db_setup', '.sql']) do |file|
+        file.write(sql)
+        file.flush
+        system("mysql --protocol=SOCKET --socket=#{socket} -u #{root_user} #{password_arg} < #{file.path}") or
+          abort("Failed to create MySQL DB '#{db_name}'")
+      end
+
+      puts "✅ MySQL database '#{db_name}' created/ready"
+      { user: root_user, password: root_password }
+    end
   end
 end

data/lib/stable/db_manager.rb

@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+module Stable
+  class DBManager
+    attr_reader :name, :adapter
+
+    def initialize(name, adapter:)
+      @name = name
+      @adapter = adapter
+    end
+
+    # Main entry
+    def create
+      case adapter
+      when :postgresql
+        ensure_postgres_database
+      when :mysql
+        ensure_mysql_database
+      else
+        abort "Unsupported database adapter: #{adapter}"
+      end
+    end
+
+    # Rails database.yml config
+    def rails_config
+      case adapter
+      when :postgresql
+        {
+          'adapter' => 'postgresql',
+          'encoding' => 'unicode',
+          'database' => name,
+          'username' => app_user,
+          'password' => nil,
+          'host' => 'localhost',
+          'pool' => 5
+        }
+      when :mysql
+        {
+          'adapter' => 'mysql2',
+          'encoding' => 'utf8mb4',
+          'database' => name,
+          'username' => app_user,
+          'password' => '',
+          'host' => 'localhost',
+          'socket' => mysql_socket,
+          'pool' => 5
+        }
+      else
+        abort "Unsupported adapter for Rails config: #{adapter}"
+      end
+    end
+
+    private
+
+    # -------------------- PostgreSQL --------------------
+
+    def ensure_postgres_database
+      exists = system(%(psql -lqt | cut -d \\| -f 1 | grep -w #{name} >/dev/null))
+
+      if exists
+        puts "⚠ Postgres database '#{name}' already exists. Skipping creation."
+      else
+        system("createdb #{name}") or abort("Failed to create Postgres DB '#{name}'")
+      end
+    end
+
+    # -------------------- MySQL --------------------
+
+    def ensure_mysql_database
+      ensure_mysql_root_auth!
+
+      # Create DB and user
+      socket = mysql_socket
+      user = app_user
+
+      system(%(
+        mysql --protocol=SOCKET --socket=#{socket} -u root <<SQL
+          CREATE DATABASE IF NOT EXISTS #{name};
+          CREATE USER IF NOT EXISTS '#{user}'@'localhost' IDENTIFIED BY '';
+          GRANT ALL PRIVILEGES ON #{name}.* TO '#{user}'@'localhost';
+          FLUSH PRIVILEGES;
+        SQL
+      )) or abort("Failed to create MySQL DB '#{name}'")
+
+      puts "✅ MySQL database '#{name}' ready"
+    end
+
+    # Ensure root can connect via socket
+    def ensure_mysql_root_auth!
+      ok = system("mysql -u root -e 'SELECT 1' >/dev/null 2>&1")
+      return if ok
+
+      puts '⚠ Fixing MySQL root authentication (requires sudo)...'
+      socket = mysql_socket
+
+      system(%(
+        sudo mysql --protocol=SOCKET --socket=#{socket} <<SQL
+          ALTER USER 'root'@'localhost' IDENTIFIED BY '';
+          FLUSH PRIVILEGES;
+        SQL
+      )) or abort('Failed to repair MySQL root authentication')
+    end
+
+    # Detect MySQL socket on macOS / Linux
+    def mysql_socket
+      paths = [
+        '/opt/homebrew/var/mysql/mysql.sock', # Homebrew macOS
+        '/tmp/mysql.sock',                    # Default
+        '/var/run/mysqld/mysqld.sock' # Linux default
+      ]
+
+      paths.each { |p| return p if File.exist?(p) }
+      abort 'MySQL socket not found. Is MySQL running?'
+    end
+
+    # Default Rails DB user
+    def app_user
+      ENV['USER'] || 'stable'
+    end
+  end
+end

data/lib/stable.rb

@@ -12,3 +12,4 @@ require_relative 'stable/cli'
 require_relative 'stable/registry'
 require_relative 'stable/scanner'
 require_relative 'stable/bootstrap'
+require_relative 'stable/db_manager'

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.9
 platform: ruby
 authors:
 - Danny Simfukwe
@@ -50,6 +50,7 @@ files:
 - lib/stable.rb
 - lib/stable/bootstrap.rb
 - lib/stable/cli.rb
+- lib/stable/db_manager.rb
 - lib/stable/paths.rb
 - lib/stable/registry.rb
 - lib/stable/scanner.rb