stable-cli-rails 0.7.11 → 0.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe9114ae5eae07811ec911b967cef33620ebf62c7df4f30c202f3743f7d6bea5
-  data.tar.gz: 91920b483e2c26e58d1ef7ca7c786ea5cf91a4849ac16ec276fee4cdbf72d878
+  metadata.gz: f092ba86af858aef49a2de7704a7039e3f25accafaf9028254469e9621c754ea
+  data.tar.gz: 4ab71b60ae850c74508c790cf0fce5b14c2d12e0c8f2ec793a6b5e5234a95529
 SHA512:
-  metadata.gz: dbdc4b736300bd5a395f67b9138e3aa7410a0184d4f5ea2be6f5e3445934fcf57588b526e5b957ee0c551247ab3013febd29eaffd96cc7bde43f982df91e3b53
-  data.tar.gz: 19e8dd338cd34dd6621159785171c970468d43b0f423048c4c3fc10bd4ab4851cedd59091a03e1748acf990fa1853a7b1da33bbadba552bae186a71a69799f3e
+  metadata.gz: 830108d826c9a63cdbaabf2c539b083795d7cf2772e1d8cea0c91d39dcefcaf06e792e1865793d7c7ab1da428b810228a36bbba34038555bcf20aefe03d2c295
+  data.tar.gz: acdf43e4787cf9115eb29b4900f670cb9e2ce0a0fed29ba3f251cf40f00948897a3ed1c1edff3109053031c3ed6d238e4632d28f681fc591548635f9f03951ac

data/lib/stable/cli.rb

@@ -29,6 +29,7 @@ module Stable
     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'
+    method_option :full, type: :boolean, default: false, desc: 'Setup full Rails app common generators'
     def new(name, ruby: RUBY_VERSION, rails: nil, port: nil)
       safe_name = Validators::AppName.call!(name)
       Commands::New.new(safe_name, options).call

data/lib/stable/services/app_creator.rb

@@ -15,55 +15,54 @@ 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)
 
-        # --- Ensure Ruby + gemset ---
+        # --- Ensure Ruby version & RVM ---
         Ruby.ensure_version(ruby)
         Ruby.ensure_rvm!
-        System::Shell.run("bash -lc 'source #{Ruby.rvm_script} && rvm #{ruby}@#{@name} --create do true'")
+
+        # --- Create gemset ---
+        System::Shell.run("bash -lc 'source #{Ruby.rvm_script} && rvm #{ruby} do rvm gemset create #{@name} || true'")
 
         rvm_cmd = Ruby.rvm_prefix(ruby, @name)
 
-        # --- Install Rails into gemset if missing ---
-        rails_version = @options[:rails]
-        rails_check_cmd = if rails_version
-                            "#{rvm_cmd} gem list -i rails -v #{rails_version}"
-                          else
-                            "#{rvm_cmd} gem list -i rails"
-                          end
+        # --- Install Bundler ---
+        System::Shell.run("bash -lc '#{rvm_cmd} gem install bundler --no-document'")
 
+        # --- Install Rails if missing ---
+        rails_version = @options[:rails]
+        rails_check_cmd = rails_version ? "#{rvm_cmd} gem list -i rails -v #{rails_version}" : "#{rvm_cmd} gem list -i rails"
         unless system("bash -lc '#{rails_check_cmd}'")
-          puts "Installing Rails #{rails_version || 'latest'} in gemset..."
+          puts "Installing Rails #{rails_version || 'latest'}..."
           install_cmd = rails_version ? "#{rvm_cmd} gem install rails -v #{rails_version}" : "#{rvm_cmd} gem install rails"
-          system("bash -lc '#{install_cmd}'") or abort('Failed to install Rails')
+          system("bash -lc '#{install_cmd}'") or abort("Failed to install Rails #{rails_version || ''}")
         end
 
         # --- Create Rails app ---
         puts "Creating Rails app #{@name} (Ruby #{ruby})..."
-        System::Shell.run("bash -lc '#{rvm_cmd} rails new #{app_path}'")
+        System::Shell.run("bash -lc '#{rvm_cmd} rails new #{app_path} \
+                              --skip-importmap  \
+                              --skip-hotwire  \
+                              --skip-javascript  \
+                              --skip-solid'")
 
-        # --- Write ruby version/gemset and bundle install inside gemset ---
+        # --- Write ruby version/gemset ---
         Dir.chdir(app_path) do
           File.write('.ruby-version', "#{ruby}\n")
           File.write('.ruby-gemset', "#{@name}\n")
-
-          puts 'Running bundle install...'
-          System::Shell.run("bash -lc '#{rvm_cmd} bundle install --jobs=4 --retry=3'")
         end
 
         # --- Database integration ---
         if @options[:db]
-          adapter = if @options[:mysql]
-                      :mysql
-                    else
-                      :postgresql
-                    end
-
+          adapter = @options[:mysql] ? :mysql : :postgresql
           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"
@@ -72,17 +71,85 @@ module Stable
             puts "✅ Added '#{gem_name}' gem to Gemfile"
           end
 
-          # ensure gem is installed inside gemset
-          System::Shell.run("bash -lc 'cd #{app_path} && #{rvm_cmd} bundle install --jobs=4 --retry=3'")
+          # Use correct Ruby/gemset for bundle install
+          System::Shell.run(rvm_run('bundle install --jobs=4 --retry=3', chdir: app_path))
 
-          # run adapter setup which will write database.yml and prepare
           db_adapter = adapter == :mysql ? Database::MySQL : Database::Postgres
-          db_adapter.new(app_name: @name, app_path: app_path).setup
+          db_adapter.new(app_name: @name, app_path: app_path, ruby: ruby).setup
+        end
+
+        # --- Run bundle & DB prepare ---
+        System::Shell.run(rvm_run('bundle install --jobs=4 --retry=3', chdir: app_path))
+        System::Shell.run(rvm_run('bundle exec rails db:prepare', chdir: app_path))
+
+        rails_version = `bash -lc 'cd #{app_path} && #{rvm_cmd} bundle exec rails runner "puts Rails.version"'`.strip.to_f
+
+        begin
+          rails_ver = Gem::Version.new(rails_version)
+        rescue ArgumentError
+          rails_ver = Gem::Version.new('0.0.0')
+        end
+
+        # only if Rails >= 7
+        if rails_ver >= Gem::Version.new('7.0.0')
+          # Gems to re-add
+          optional_gems = {
+            'importmap-rails' => nil,
+            'turbo-rails' => nil,
+            'stimulus-rails' => nil,
+            'solid_cache' => nil,
+            'solid_queue' => nil,
+            'solid_cable' => nil
+          }
+
+          gemfile = File.join(app_path, 'Gemfile')
+
+          # Add gems if not already present
+          optional_gems.each do |gem_name, version|
+            next if File.read(gemfile).match?(/^gem ['"]#{gem_name}['"]/)
+
+            File.open(gemfile, 'a') do |f|
+              f.puts version ? "gem '#{gem_name}', '#{version}'" : "gem '#{gem_name}'"
+            end
+          end
+
+          # Install all new gems
+          System::Shell.run(rvm_run('bundle install', chdir: app_path))
+
+          # Run generators for installed gems
+          generators = [
+            'importmap:install',
+            'turbo:install stimulus:install',
+            'solid_cache:install solid_queue:install solid_cable:install'
+          ]
+
+          generators.each do |cmd|
+            System::Shell.run(rvm_run("bundle exec rails #{cmd}", chdir: app_path))
+          end
         end
 
-        # --- Refresh bundle and prepare DB (idempotent) ---
-        System::Shell.run("bash -lc 'cd #{app_path} && #{rvm_cmd} bundle check || #{rvm_cmd} bundle install'")
-        System::Shell.run("bash -lc 'cd #{app_path} && #{rvm_cmd} bundle exec rails db:prepare'")
+        # --- Add allowed host for Rails < 7.2 ---
+        if @options[:rails] && @options[:rails].to_f < 7.2
+          env_file = File.join(app_path, 'config/environments/development.rb')
+
+          if File.exist?(env_file)
+            content = File.read(env_file)
+
+            # Append host config inside the Rails.application.configure block
+            updated_content = content.gsub(/Rails\.application\.configure do(.*?)end/mm) do |_match|
+              inner = Regexp.last_match(1)
+              # Prevent duplicate entries
+              unless inner.include?(domain)
+                inner += "  # allow local .test host for this app\n  config.hosts << '#{domain}'\n"
+              end
+              "Rails.application.configure do#{inner}end"
+            end
+
+            File.write(env_file, updated_content)
+          else
+            warn "Development environment file not found: #{env_file}"
+          end
+        end
 
         # --- Hosts, certs, caddy ---
         Services::HostsManager.add(domain)
@@ -90,50 +157,31 @@ module Stable
         Services::CaddyManager.ensure_running!
         Services::CaddyManager.reload
 
-        # --- Start the app ---
+        # --- 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))
 
         abort "Port #{port} is already in use. Choose another port." if port_in_use?(port)
 
-        pid = spawn('bash', '-lc', "cd \"#{app_path}\" && #{rvm_cmd} bundle exec rails s -p #{port} -b 127.0.0.1",
-                    out: log_file, err: log_file)
+        pid = spawn(
+          'bash', '-lc',
+          "cd \"#{app_path}\" && #{rvm_cmd} bundle exec rails s -p #{port} -b 127.0.0.1",
+          out: log_file, err: log_file
+        )
         Process.detach(pid)
-
         AppRegistry.update(@name, started_at: Time.now.to_i, pid: pid)
 
         sleep 1.5
         wait_for_port(port)
-        prefix = @options[:skip_ssl] ? 'http' : 'https'
-        display_domain = if @options[:skip_ssl]
-                           "#{domain}:#{port}"
-                         else
-                           domain
-                         end
 
+        prefix = @options[:skip_ssl] ? 'http' : 'https'
+        display_domain = @options[:skip_ssl] ? "#{domain}:#{port}" : domain
         puts "✔ #{@name} running at #{prefix}://#{display_domain}"
       end
 
       private
 
-      def create_rails_app
-        System::Shell.run("rails new #{@name}")
-      end
-
-      def setup_database
-        return unless @options[:mysql] || @options[:postgres]
-
-        adapter =
-          if @options[:mysql]
-            Database::MySQL
-          else
-            Database::Postgres
-          end
-
-        adapter.new(@name).setup
-      end
-
       def next_free_port
         used_ports = Services::AppRegistry.all.map { |a| a[:port] }
         port = 3000
@@ -158,6 +206,13 @@ module Stable
           sleep 0.5
         end
       end
+
+      def rvm_run(cmd, chdir: nil, ruby: nil)
+        ruby ||= @options[:ruby] || RUBY_VERSION
+        gemset = @name
+        cd = chdir ? "cd #{chdir} && " : ''
+        "bash -lc '#{cd}source #{Dir.home}/.rvm/scripts/rvm && rvm #{ruby}@#{gemset} do #{cmd}'"
+      end
     end
   end
 end

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

@@ -4,9 +4,10 @@ module Stable
   module Services
     module Database
       class Base
-        def initialize(app_name:, app_path:)
+        def initialize(app_name:, app_path:, ruby:)
           @app_name = app_name
           @app_path = app_path
+          @ruby     = ruby
           @database_name = @app_name
                            .downcase
                            .gsub(/[^a-z0-9_]/, '_')
@@ -16,7 +17,7 @@ module Stable
 
         def prepare
           System::Shell.run(
-            "cd #{@app_path} && bundle exec rails db:prepare"
+            bash_rvm('bundle exec rails db:prepare')
           )
         end
 
@@ -41,6 +42,14 @@ module Stable
         def base_config(_creds)
           raise NotImplementedError
         end
+
+        def bash_rvm(cmd)
+          raise 'ruby not set' unless @ruby
+          raise 'app_name not set' unless @app_name
+          raise 'app_path not set' unless @app_path
+
+          "bash -lc 'cd #{@app_path} && source #{Ruby.rvm_script} && rvm #{@ruby}@#{@app_name} do #{cmd}'"
+        end
       end
     end
   end

data/lib/stable/services/ruby.rb

@@ -97,6 +97,15 @@ module Stable
           "rvm #{ruby} do"
         end
       end
+
+      def self.clean_rvm_exec(ruby, gemset, cmd)
+        <<~CMD
+          bash -lc '
+            source #{rvm_script};
+            rvm #{ruby}@#{gemset} --create do #{cmd}
+          '
+        CMD
+      end
     end
   end
 end

metadata

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