stable-cli-rails 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55e25d45106e712c1d3e9d23754150d9519e34b38d4464652c4c0a21539a0597
-  data.tar.gz: a2bb082ffeb11bf916903f7a15cc0da89a5136c33d53b3139038d7d294591f2d
+  metadata.gz: 2d0788683f7e8f99ac96bf00779599a7003e7c2f866a5a124a0fbbbca56c7a1a
+  data.tar.gz: 2c4d7c5ae3f0ee878e9f8c85660df787c340782eef1a1ea3c9c60460180c3259
 SHA512:
-  metadata.gz: 954bb6bd50281fe5a47ed03e2cead5a2c614f7786d17cdc4831c50ab798e0a6fac59dc1b98b76f3d35524be574396813444bbf3d4f60099e7e81b44846658ef4
-  data.tar.gz: 275d760d16ce88fb018f3aad059330fd05c63911aa19352b67780bd8d8680d64918583ece7e48e2eb452329c468fff3eaac5a7fdee92341425ff792421646c0b
+  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'
 
@@ -26,6 +28,9 @@ 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)
@@ -75,6 +80,84 @@ module Stable
         system("bash -lc '#{ruby_cmd} bundle install --jobs=4 --retry=3'") or abort('bundle install failed')
       end
 
+      # --- 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)
       generate_cert(domain) unless options[:skip_ssl]
@@ -412,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
+
+      # --- 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 'Installing mkcert...'
-      system('brew install mkcert nss')
-      system('mkcert -install')
+      puts '✅ All dependencies are installed and running.'
     end
 
+
     def ensure_caddy_running!
       api_port = 2019
 
@@ -509,7 +611,7 @@ module Stable
       end
     end
 
-    def wait_for_port(port, timeout: 10)
+    def wait_for_port(port, timeout: 20)
       require 'socket'
       start = Time.now
 
@@ -619,5 +721,38 @@ module Stable
         "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.8
+  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