rsodx 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2838e8484734c021c3e0ff36d938ac3751f09cf6a434bee8b0a5cc63e7e6fd5d
-  data.tar.gz: 6786100bd34f0102bc633aa176d43e7ad5fa469a85afb3dec790f3d528de98d7
+  metadata.gz: 61e9cf61ed88c22762b697fb6a3a2fdc9c5ce3ce52e4d37d866f5448434f331e
+  data.tar.gz: 894c422fa5d6a073bf768cdba0911745754809872fb50eb053e3b611608ae5a7
 SHA512:
-  metadata.gz: 6a0261e92e7c5aa298e3318c9b94f00acc9e847a959ef049d461d44a892428b94452f040683f81191b31f79387c8f15d0c020738cb57162da575241b721f82f5
-  data.tar.gz: 65112fe06be40230b2b882339f6d1bd8f7b8cc30e6412d62732e14ac684aff6c98b280d5a95bacdaadc7504bb911a01ef2b2dea0c7eec3f34cb93a4b5048e771
+  metadata.gz: 07c13df22646b8ba6870b1c33cc6ca92bd88fb75bcd7e45aa0a3611406f1d5a3dd36f9d56c48a7cc5ad9c1230fd0f180c9f8d8b560efe23c77001bb2a4ba32e8
+  data.tar.gz: 8c8c3db72ea43d5f8da5c00ceaf0ef365589335f46932ffae464558e057de610dc5e06380aa8dcc70c8f2b6bdd3c345e82e8a83b04343e3edaa377390582dec9

data/README.md

@@ -69,6 +69,40 @@ bin/rsodx [command] [args]
 
 ---
 
+Конечно! Вот секция для `README.md` на английском — про команды `db:migrate` и `db:rollback`:
+
+---
+
+## 🛠 Database Commands
+
+The `rsodx` CLI provides simple tools for running Sequel migrations:
+
+### 🔼 `db:migrate`
+
+Runs all pending migrations in `db/migrations`.
+
+```bash
+bin/rsodx db:migrate
+```
+
+- Automatically creates the `schema_migrations` table if it doesn't exist.
+- Supports timestamped migrations (e.g. `20250417061127_create_users.rb`).
+- Prints a success message on completion.
+
+### 🔽 `db:rollback`
+
+Rolls back the last executed migration.
+
+```bash
+bin/rsodx db:rollback
+```
+
+- Determines the current version from the `schema_migrations` table.
+- Rolls back to the previous migration based on timestamp.
+- Skips rollback if only one migration is applied.
+
+---
+
 ## 🔧 Generators
 
 Generate various application components using simple commands:

data/lib/rsodx/cli/cli.rb

@@ -9,6 +9,31 @@ module Rsodx::Cli
   extend Dry::CLI::Registry
 
   def self.setup!
+    register_commands_with_alias(
+      group: "",
+      alias_prefix: "",
+      commands: {
+        "db:migrate" => ::Rsodx::Cli::Commands::Db::Migrate
+      }
+    )
+
+    register_commands_with_alias(
+      group: "",
+      alias_prefix: "",
+      commands: {
+        "db:rollback" => ::Rsodx::Cli::Commands::Db::Rollback
+      }
+    )
+
+    register_commands_with_alias(
+      group: "",
+      alias_prefix: "",
+      commands: {
+        "console" => ::Rsodx::Cli::Commands::Console,
+        "c"   => ::Rsodx::Cli::Commands::Console
+      }
+    )
+
     register_commands_with_alias(
       group: "",
       alias_prefix: "",

data/lib/rsodx/cli/commands/console.rb

@@ -0,0 +1,33 @@
+require "dry/cli"
+require "irb"
+require "irb/completion"
+
+module Rsodx::Cli::Commands
+  class Console < Dry::CLI::Command
+    desc "Start the Rsodx development console"
+
+    def call(*)
+      project_root = Rsodx.project_root
+      environment_path = File.join(project_root, "config", "environment.rb")
+
+      unless File.exist?(environment_path)
+        abort "❌ Could not find config/environment.rb in #{project_root}"
+      end
+
+      require environment_path
+
+      TOPLEVEL_BINDING.eval('def reload!; Rsodx.reload!; end')
+
+      puts Rsodx::LOGO
+      puts "🔬 Welcome to Rsodx console (#{ENV['RACK_ENV'] || 'development'})"
+      puts "Tip: access Rsodx modules, models, services, etc."
+
+      ARGV.clear
+      IRB.start
+    rescue LoadError => e
+      abort "❌ Failed to load: #{e.message}"
+    rescue StandardError => e
+      abort "❌ An error occurred: #{e.message}"
+    end
+  end
+end

data/lib/rsodx/cli/commands/db/migrate.rb

@@ -0,0 +1,20 @@
+require "sequel/extensions/migration"
+
+module Rsodx::Cli::Commands::Db
+  class Migrate < Dry::CLI::Command
+    desc "Migrate"
+
+    def call(*)
+      project_root = Rsodx.project_root
+      environment_path = File.join(project_root, "config", "environment.rb")
+
+      unless File.exist?(environment_path)
+        abort "❌ Could not find config/environment.rb in #{project_root}"
+      end
+
+      require environment_path
+
+      Sequel::Migrator.run(Rsodx::Connect.db, "db/migrations")
+    end
+  end
+end

data/lib/rsodx/cli/commands/db/rollback.rb

@@ -0,0 +1,27 @@
+require "sequel/extensions/migration"
+
+module Rsodx::Cli::Commands::Db
+  class Rollback < Dry::CLI::Command
+    desc "Rollback"
+
+    def call(*)
+      project_root = Rsodx.project_root
+      environment_path = File.join(project_root, "config", "environment.rb")
+
+      unless File.exist?(environment_path)
+        abort "❌ Could not find config/environment.rb in #{project_root}"
+      end
+
+      require environment_path
+      migration_table = :schema_migrations
+      migration_dir = 'db/migrations'
+
+      versions = Rsodx::Connect.db[migration_table].select(:filename).map { |r| r[:filename] }
+      version_numbers = versions.map { |f| f.to_s[/^\d+/].to_i }.sort
+
+      current_version = version_numbers.last
+      previous_version = version_numbers[-2] || 0
+      Sequel::Migrator.run(Rsodx::Connect.db, migration_dir, target: previous_version)
+    end
+  end
+end

data/lib/rsodx/cli/commands/scaffold.rb

@@ -28,8 +28,13 @@ module Rsodx::Cli::Commands
     private
 
     def create_folders
-      FOLDERS.each do |path|
-        FileUtils.mkdir_p(File.join(@app_path, path))
+      KEEPABLE_FOLDERS.each do |folder|
+        FileUtils.mkdir_p(File.join(@app_path, folder))
+        FileUtils.touch(File.join(@app_path, folder, '.keep'))
+      end
+
+      FRAMEWORK_FOLDERS.each do |folder|
+        FileUtils.mkdir_p(File.join(@app_path, folder))
       end
     end
 
@@ -48,11 +53,9 @@ module Rsodx::Cli::Commands
       write("app/router.rb", ROUTE)
       write("config/environments/development.rb", "")
       write("config.ru", CONFIGRU)
-      write("bin/console", CONSOLE)
       write("bin/rsodx", BINRSODX)
 
       FileUtils.chmod("+x", File.join(@app_path, "bin/rsodx"))
-      FileUtils.chmod("+x", File.join(@app_path, "bin/console"))
     end
 
     def write(relative_path, content)

data/lib/rsodx/cli/commands/scaffold_common.rb

@@ -2,8 +2,8 @@ module Rsodx::Cli::Commands::ScaffoldCommon
   RUBY_VERSION = "3.4.2".freeze
 
   GITIGNORE = <<~GITIGNORE.freeze
-  .env
-  tmp/
+    .env
+    tmp/
   GITIGNORE
 
   #  path: "../rsodx"
@@ -25,36 +25,25 @@ module Rsodx::Cli::Commands::ScaffoldCommon
     Rsodx::CLI.call
   BINRSODX
 
-  CONSOLE = <<~CONSOLE.freeze
-    #!/usr/bin/env ruby
-
-    require "irb"
-    require "irb/completion"
-
-    def reload!
-      puts "🔄 Reloading..."
-      load File.expand_path("../config/environment.rb", __dir__)
-    end
-
-    require_relative "../config/environment"
-
-    puts "🔬 Welcome to Rsodx console (#{ENV['RACK_ENV'] || 'development'})"
-    puts "Tip: access Rsodx modules, models, services, etc."
-
-    IRB.start
-  CONSOLE
-
   CONFIGRU = <<~RACK.freeze
     require_relative "./app/app"
     run App
   RACK
 
   ENV_LOADER = <<~ENV_LOADER.freeze
+    require "zeitwerk"
     require "rsodx"
+
     Rsodx::Environment.load_dotenv(ENV["RACK_ENV"] || "development")
-    Rsodx::Connect.connect ENV["DATABASE_URL"]
+    
+    Rsodx.configure do |config|
+      config.database_url = ENV["DATABASE_URL"]
+    end
+    Rsodx::Connect.connect
+
     Rsodx::Environment.load_initializers(File.expand_path("../..", __FILE__))
-    Rsodx::Boot.load_app_structure(File.expand_path("../..", __FILE__))
+
+    Rsodx.loader
   ENV_LOADER
 
   ROUTE = <<~ROUTE.freeze
@@ -101,7 +90,23 @@ module Rsodx::Cli::Commands::ScaffoldCommon
     DATABASE_URL=postgres://rsodx:paSs4321@localhost:5432/rsodx_development
   ENVFILE
 
-  FOLDERS = %w[app/controllers app/services app/models app/presenters
-                 app/serializers config/initializers
-                 config/environments db/migrations spec bin].freeze
+  KEEPABLE_FOLDERS = %w[
+    lib
+    app/controllers
+    app/workers
+    app/services
+    app/models
+    app/presenters
+    app/serializers
+    config/initializers
+    config/environments
+    db/migrations
+    spec
+  ].freeze
+
+  FRAMEWORK_FOLDERS = %w[
+    bin
+    config
+  ].freeze
+
 end

data/lib/rsodx/configuration.rb

@@ -0,0 +1,9 @@
+module Rsodx
+  class Configuration
+    attr_accessor :database_url
+
+    def initialize
+      @database_url = ENV["DATABASE_URL"]
+    end
+  end
+end

data/lib/rsodx/connect.rb

@@ -2,12 +2,18 @@ require "sequel"
 
 module Rsodx
   module Connect
-    def self.connect(url)
+    @db = nil
+
+    def self.connect(url = Rsodx.config.database_url)
       raise "Missing DATABASE_URL" unless url
+      return @db if @db
+
+      @db = Sequel.connect(url)
+      Sequel::Model.db = @db
+    end
 
-      db = Sequel.connect(url)
-      Sequel::Model.db = db
-      db
+    def self.db
+      @db || connect
     end
   end
 end

data/lib/rsodx/tasks.rb

@@ -1,15 +1,2 @@
 return unless defined?(Rake::DSL) rescue false
 include Rake::DSL if defined?(Rake::DSL)
-
-require "sequel/extensions/migration"
-
-namespace :db do
-  task :migrate do
-    Sequel::Migrator.run(DB.connect, "db/migrations")
-  end
-
-  task :rollback do
-    target = Sequel::Migrator.apply(DB.connect, "db/migrations", :down) - 1
-    Sequel::Migrator.run(DB.connect, "db/migrations", target: target)
-  end
-end

data/lib/rsodx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rsodx
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/lib/rsodx.rb

@@ -14,4 +14,47 @@ Dir.glob("#{base}/rsodx/**/*.rb").sort.each do |file|
 end
 
 module Rsodx
+  class << self
+    attr_accessor :config
+
+    def configure
+      self.config ||= Configuration.new
+      yield(config)
+    end
+  end
+
+  def self.project_root
+    @root ||= Dir.pwd
+  end
+
+  def self.loader
+    @loader ||= begin
+                  loader = Zeitwerk::Loader.new
+
+      #  need to be merged with ScaffoldCommon
+      %w[
+        app/models
+        app/services
+        app/workers
+        app/presenters
+        app/serializers
+        app/controllers
+      ].each do |subdir|
+                    path = File.join(project_root, subdir)
+                    loader.push_dir(path) if Dir.exist?(path)
+                  end
+
+                  loader.enable_reloading
+                  loader.setup
+                  loader
+                end
+  end
+
+  def self.reload!
+    puts "🔄 Reloading..."
+    loader.reload
+  end
 end
+
+Rsodx.config ||= Rsodx::Configuration.new
+Rsodx.loader

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rsodx
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Eugene Pervushin
 bindir: bin
 cert_chain: []
-date: 2025-04-16 00:00:00.000000000 Z
+date: 2025-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -191,6 +191,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.13'
+- !ruby/object:Gem::Dependency
+  name: irb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
 description: Rsodx is a lightweight Ruby microframework designed for modular, service-oriented
   applications. Built with simplicity and performance in mind, it's perfect for small
   web apps, microservices, and CLI tools.
@@ -211,6 +253,9 @@ files:
 - lib/rsodx/base.rb
 - lib/rsodx/boot.rb
 - lib/rsodx/cli/cli.rb
+- lib/rsodx/cli/commands/console.rb
+- lib/rsodx/cli/commands/db/migrate.rb
+- lib/rsodx/cli/commands/db/rollback.rb
 - lib/rsodx/cli/commands/generator.rb
 - lib/rsodx/cli/commands/generators/action.rb
 - lib/rsodx/cli/commands/generators/controller.rb
@@ -220,6 +265,7 @@ files:
 - lib/rsodx/cli/commands/scaffold.rb
 - lib/rsodx/cli/commands/scaffold_common.rb
 - lib/rsodx/cli/commands/server.rb
+- lib/rsodx/configuration.rb
 - lib/rsodx/connect.rb
 - lib/rsodx/constants.rb
 - lib/rsodx/contract.rb