stable-cli-rails 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b8d5b304fbf560e181a416e2087e912c4fe2a26cd358341a263d1b890540069
-  data.tar.gz: 6e98c5d24b16f5669f442fab9c313a3ee74c790551a776e40e56773ed901e9d3
+  metadata.gz: fe9114ae5eae07811ec911b967cef33620ebf62c7df4f30c202f3743f7d6bea5
+  data.tar.gz: 91920b483e2c26e58d1ef7ca7c786ea5cf91a4849ac16ec276fee4cdbf72d878
 SHA512:
-  metadata.gz: 41399496362c590019b87351d9e69364b41e6a3ecf0f10a7906a1c3edbaa508557104bd33cfb855623ee0b1e75e690b4d7834a42bd90025bfc5f23bc28dd2bf3
-  data.tar.gz: e4779489d26bd0b472a3a6f545039296bb7481aa87df1dbfa0748acd440f3e78b79f091b318956d6bc92aae8e7179f1f66393f9d800fff5b015a47bb3c2edc45
+  metadata.gz: dbdc4b736300bd5a395f67b9138e3aa7410a0184d4f5ea2be6f5e3445934fcf57588b526e5b957ee0c551247ab3013febd29eaffd96cc7bde43f982df91e3b53
+  data.tar.gz: 19e8dd338cd34dd6621159785171c970468d43b0f423048c4c3fc10bd4ab4851cedd59091a03e1748acf990fa1853a7b1da33bbadba552bae186a71a69799f3e

data/bin/stable

@@ -1,3 +1,5 @@
 #!/usr/bin/env ruby
-require "stable"
+# frozen_string_literal: true
+
+require 'stable'
 Stable::CLI.start(ARGV)

data/lib/stable/cli.rb

@@ -10,8 +10,6 @@ require_relative 'registry'
 
 module Stable
   class CLI < Thor
-    HOSTS_FILE = '/etc/hosts'
-
     def initialize(*)
       super
       Stable::Bootstrap.run!
@@ -32,7 +30,8 @@ module Stable
     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)
-      Commands::New.new(name, options).call
+      safe_name = Validators::AppName.call!(name)
+      Commands::New.new(safe_name, options).call
     end
 
     desc 'list', 'List detected apps'
@@ -159,108 +158,8 @@ module Stable
       system("lsof -i tcp:#{port} > /dev/null 2>&1")
     end
 
-    def generate_cert(domain)
-      cert_path = File.join(Stable::Paths.certs_dir, "#{domain}.pem")
-      key_path  = File.join(Stable::Paths.certs_dir, "#{domain}-key.pem")
-      FileUtils.mkdir_p(Stable::Paths.certs_dir)
-
-      return if File.exist?(cert_path) && File.exist?(key_path)
-
-      if system('which mkcert > /dev/null')
-        system("mkcert -cert-file #{cert_path} -key-file #{key_path} #{domain}")
-      else
-        puts 'mkcert not found. Please install mkcert.'
-      end
-    end
-
-    def update_caddyfile(domain, port)
-      caddyfile = Stable::Paths.caddyfile
-      FileUtils.touch(caddyfile) unless File.exist?(caddyfile)
-      content = File.read(caddyfile)
-
-      # remove existing block for domain
-      regex = %r{
-        https://#{Regexp.escape(domain)}\s*\{
-        .*?
-        \}
-      }mx
-
-      content = content.gsub(regex, '')
-
-      # add new block
-      cert_path = File.join(Stable::Paths.certs_dir, "#{domain}.pem")
-      key_path  = File.join(Stable::Paths.certs_dir, "#{domain}-key.pem")
-      block = <<~CADDY
-
-        https://#{domain} {
-            reverse_proxy 127.0.0.1:#{port}
-            tls #{cert_path} #{key_path}
-        }
-      CADDY
-
-      File.write(caddyfile, content + block)
-      system("caddy fmt --overwrite #{caddyfile}")
-    end
-
-    def ensure_certs_dir!
-      certs_dir = Stable::Paths.certs_dir
-      FileUtils.mkdir_p(certs_dir)
-
-      begin
-        FileUtils.chown_R(Etc.getlogin, nil, certs_dir)
-      rescue StandardError => e
-        puts "Could not change ownership: #{e.message}"
-      end
-
-      # Restrict permissions for security
-      Dir.glob("#{certs_dir}/*.pem").each do |pem|
-        FileUtils.chmod(0o600, pem)
-      end
-    end
-
-    def wait_for_port(port, timeout: 20)
-      require 'socket'
-      start = Time.now
-
-      loop do
-        TCPSocket.new('127.0.0.1', port).close
-        return
-      rescue Errno::ECONNREFUSED
-        raise "Rails never bound port #{port}. Check log/stable.log" if Time.now - start > timeout
-
-        sleep 0.5
-      end
-    end
-
-    # RVM/ruby helpers moved to Services::Ruby
-
-    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!
       Services::AppRegistry.dedupe
     end
-
-    def gemset_for(app)
-      Stable::Services::Ruby.gemset_for(app)
-    end
-
-    def rvm_exec(app, ruby)
-      Stable::Services::Ruby.rvm_exec(app, ruby)
-    end
   end
 end

data/lib/stable/commands/list.rb

@@ -21,14 +21,7 @@ module Stable
       private
 
       def print_header
-        puts format(
-          '%-18s %-26s %-8s %-10s %-10s',
-          'APP',
-          'DOMAIN',
-          'PORT',
-          'RUBY',
-          'STATUS'
-        )
+        puts 'APP                DOMAIN                     PORT     RUBY       STATUS    '
         puts '-' * 78
       end
 

data/lib/stable/services/app_creator.rb

@@ -15,7 +15,8 @@ module Stable
         domain = "#{@name}.test"
 
         # --- Register app in registry ---
-        Services::AppRegistry.add(name: @name, path: app_path, domain: domain, port: port, ruby: ruby, started_at: nil, pid: nil)
+        Services::AppRegistry.add(name: @name, path: app_path, domain: domain, port: port, ruby: ruby, started_at: nil,
+                                  pid: nil)
 
         abort "Folder already exists: #{app_path}" if File.exist?(app_path)
 
@@ -106,10 +107,10 @@ module Stable
         wait_for_port(port)
         prefix = @options[:skip_ssl] ? 'http' : 'https'
         display_domain = if @options[:skip_ssl]
-                          "#{domain}:#{port}"
-                        else
-                          domain
-                        end
+                           "#{domain}:#{port}"
+                         else
+                           domain
+                         end
 
         puts "✔ #{@name} running at #{prefix}://#{display_domain}"
       end

data/lib/stable/services/caddy_manager.rb

@@ -131,6 +131,7 @@ module Stable
 
           until valid_pem?(path)
             raise "Invalid PEM file: #{path}" if Time.now - start > timeout
+
             sleep 0.1
           end
         end
@@ -142,11 +143,16 @@ module Stable
           begin
             FileUtils.chown_R(Etc.getlogin, nil, certs_dir)
           rescue StandardError
+            nil
           end
 
           Dir.glob("#{certs_dir}/*.pem").each do |pem|
             mode = pem.end_with?('-key.pem') ? 0o600 : 0o644
-            FileUtils.chmod(mode, pem) rescue nil
+            begin
+              FileUtils.chmod(mode, pem)
+            rescue StandardError
+              nil
+            end
           end
         end
       end

data/lib/stable/services/database/base.rb

@@ -7,6 +7,11 @@ module Stable
         def initialize(app_name:, app_path:)
           @app_name = app_name
           @app_path = app_path
+          @database_name = @app_name
+                           .downcase
+                           .gsub(/[^a-z0-9_]/, '_')
+                           .gsub(/_+/, '_')
+                           .gsub(/^_+|_+$/, '')
         end
 
         def prepare
@@ -22,10 +27,10 @@ module Stable
             'default' => base_config(creds),
             'development' => base_config(creds),
             'test' => base_config(creds).merge(
-              'database' => "#{@app_name}_test"
+              'database' => "#{@database_name}_test"
             ),
             'production' => base_config(creds).merge(
-              'database' => "#{@app_name}_production"
+              'database' => "#{@database_name}_production"
             )
           }
 

data/lib/stable/services/database/mysql.rb

@@ -13,7 +13,7 @@ module Stable
 
         def create_database(creds)
           System::Shell.run(
-            "mysql -u #{creds[:user]} -p#{creds[:password]} -e 'CREATE DATABASE IF NOT EXISTS #{@app_name};'"
+            "mysql -u #{creds[:user]} -p#{creds[:password]} -e 'CREATE DATABASE IF NOT EXISTS #{@database_name};'"
           )
         end
 
@@ -24,7 +24,7 @@ module Stable
             'adapter' => 'mysql2',
             'encoding' => 'utf8mb4',
             'pool' => 5,
-            'database' => @app_name,
+            'database' => @database_name,
             'username' => creds[:user],
             'password' => creds[:password],
             'host' => 'localhost'

data/lib/stable/services/database/postgres.rb

@@ -5,7 +5,7 @@ module Stable
     module Database
       class Postgres < Base
         def setup
-          System::Shell.run("createdb #{@app_name}")
+          System::Shell.run("createdb #{@database_name}")
           prepare
         end
       end

data/lib/stable/services/ruby.rb

@@ -37,7 +37,7 @@ module Stable
         rvm_script = File.expand_path('~/.rvm/scripts/rvm')
         abort 'RVM installed but could not be loaded' unless File.exist?(rvm_script)
 
-        ENV['PATH'] = "#{File.expand_path('~/.rvm/bin')}:#{ENV['PATH']}"
+        ENV['PATH'] = "#{File.expand_path('~/.rvm/bin')}:#{ENV.fetch('PATH', nil)}"
 
         system(%(bash -lc "source #{rvm_script} && rvm --version")) || abort('RVM installed but not functional')
       end

data/lib/stable/services/setup_runner.rb

@@ -21,7 +21,7 @@ module Stable
 
       def ensure_directories
         path = Stable::Paths.certs_dir
-        FileUtils.mkdir_p(path) unless Dir.exist?(path)
+        FileUtils.mkdir_p(path)
       end
 
       def ensure_apps_registry

data/lib/stable/validators/app_name.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Stable
+  module Validators
+    class AppName
+      VALID_PATTERN = /\A[a-z0-9]+(-[a-z0-9]+)*\z/
+      MAX_LENGTH = 63
+
+      def self.call!(name)
+        normalized = normalize(name)
+
+        unless valid?(normalized)
+          raise Thor::Error, <<~MSG
+            Invalid app name: "#{name}"
+
+            Use only:
+              - lowercase letters (a-z)
+              - numbers (0-9)
+              - hyphens (-)
+
+            Rules:
+              - no spaces or underscores
+              - cannot start or end with a hyphen
+              - max #{MAX_LENGTH} characters
+
+            Example:
+              stable new my-app
+          MSG
+        end
+
+        normalized
+      end
+
+      def self.normalize(name)
+        name
+          .downcase
+          .strip
+          .gsub(/\s+/, '-') # spaces → hyphens
+          .gsub(/[^a-z0-9-]/, '') # drop invalid chars
+          .gsub(/-+/, '-')        # collapse hyphens
+          .gsub(/\A-|-+\z/, '')   # trim hyphens
+      end
+
+      def self.valid?(name)
+        name.length <= MAX_LENGTH && VALID_PATTERN.match?(name)
+      end
+    end
+  end
+end

data/lib/stable.rb

@@ -14,20 +14,22 @@ require_relative 'stable/scanner'
 require_relative 'stable/bootstrap'
 require_relative 'stable/db_manager'
 
-Dir[File.join(__dir__, 'stable', 'services', '**', '*.rb')].sort.each { |f| require f }
-Dir[File.join(__dir__, 'stable', 'commands', '**', '*.rb')].sort.each { |f| require f }
-Dir[File.join(__dir__, 'stable', 'system', '**', '*.rb')].sort.each { |f| require f }
-Dir[File.join(__dir__, 'stable', 'utils', '**', '*.rb')].sort.each { |f| require f }
-Dir[File.join(__dir__, 'stable', 'config', '**', '*.rb')].sort.each { |f| require f }
+Dir[File.join(__dir__, 'stable', 'services', '**', '*.rb')].each { |f| require f }
+Dir[File.join(__dir__, 'stable', 'commands', '**', '*.rb')].each { |f| require f }
+Dir[File.join(__dir__, 'stable', 'system', '**', '*.rb')].each { |f| require f }
+Dir[File.join(__dir__, 'stable', 'utils', '**', '*.rb')].each { |f| require f }
+Dir[File.join(__dir__, 'stable', 'config', '**', '*.rb')].each { |f| require f }
+Dir[File.join(__dir__, 'stable', 'validators', '**', '*.rb')].each { |f| require f }
 
-AppRegistry = Stable::Services::AppRegistry unless defined?(::AppRegistry)
-HostsManager = Stable::Services::HostsManager unless defined?(::HostsManager)
-CaddyManager = Stable::Services::CaddyManager unless defined?(::CaddyManager)
-ProcessManager = Stable::Services::ProcessManager unless defined?(::ProcessManager)
-AppCreator = Stable::Services::AppCreator unless defined?(::AppCreator)
-AppStarter = Stable::Services::AppStarter unless defined?(::AppStarter)
-AppStopper = Stable::Services::AppStopper unless defined?(::AppStopper)
-AppRemover = Stable::Services::AppRemover unless defined?(::AppRemover)
-Database = Stable::Services::Database unless defined?(::Database)
-Ruby = Stable::Services::Ruby unless defined?(::Ruby)
-Commands = Stable::Commands unless defined?(::Commands)
+AppRegistry = Stable::Services::AppRegistry unless defined?(AppRegistry)
+HostsManager = Stable::Services::HostsManager unless defined?(HostsManager)
+CaddyManager = Stable::Services::CaddyManager unless defined?(CaddyManager)
+ProcessManager = Stable::Services::ProcessManager unless defined?(ProcessManager)
+AppCreator = Stable::Services::AppCreator unless defined?(AppCreator)
+AppStarter = Stable::Services::AppStarter unless defined?(AppStarter)
+AppStopper = Stable::Services::AppStopper unless defined?(AppStopper)
+AppRemover = Stable::Services::AppRemover unless defined?(AppRemover)
+Database = Stable::Services::Database unless defined?(Database)
+Ruby = Stable::Services::Ruby unless defined?(Ruby)
+Commands = Stable::Commands unless defined?(Commands)
+Validators = Stable::Validators unless defined?(Validators)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stable-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors:
 - Danny Simfukwe
@@ -94,10 +94,12 @@ files:
 - lib/stable/services/setup_runner.rb
 - lib/stable/system/shell.rb
 - lib/stable/utils/prompts.rb
+- lib/stable/validators/app_name.rb
 homepage: https://github.com/dannysimfukwe/stable-rails
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib