layered_stack 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6919ea27bbae60e44f91632de5468b13d525a44a55d3b95d768bd2516fd4c8c5
-  data.tar.gz: a1aec4ec02a336ea73c7c5be3cb41083ee95566b62be970a160b35983205e905
+  metadata.gz: 55f427f78d61429bd0cdf47d1573e5945efa2c00229d3b90268087d90c2a256b
+  data.tar.gz: 7a2d65ac4c1df34dcfeeed1bc5298d772260398203cdb1a06bc395c7ff5a77fd
 SHA512:
-  metadata.gz: f667ee0d4e7f5a05787fc4531c92d79c730b0b541c145525aeb675ec973120e483a143b61caba6903c7b00cfa4f2db5864213e58d8664ae2e53921886cac22f1
-  data.tar.gz: e91a6f41a8b8d1aed68aacdad4990fa6b81818a6389c9522fe230563c7738b22a874a99cd2a839ffd5f6f579a914ed7fb51baa0f64ca450b366607e6297dac43
+  metadata.gz: e4523c1c8a0f52d4ab5308b55552a507e3b5e90eab7581f6cfeb18976161a0feb036517a55cf0df8566fe848a4e27e5a290ce14b53e501ba2a10c465926723aa
+  data.tar.gz: 92be417e561bc0c8794e195ecbcf502cae7a8a718a2d0cadf77090b169203d9092b153c3cf04c515ec0c863dc18f3a4a571f3364e0f4c3e6d2c48ed0c844e548

data/assets/backend/template.rb

@@ -0,0 +1,53 @@
+gem "rack-cors", "~> 2.0.2"
+
+after_bundle do
+  # rails_command "db:create"
+  # rails_command "db:migrate"
+
+  # Remove the line "allow_browser versions: :modern" in backend/app/controllers/application_controller.rb
+  gsub_file 'app/controllers/application_controller.rb', /^(\s*allow_browser versions: :modern)/, ''
+
+  # Configure rack-cors in config/application.rb
+  inject_into_file 'config/application.rb', before: /^  end/ do
+    <<-TEXT
+
+    # Configure CORS
+    config.middleware.insert_before 0, Rack::Cors do
+      allow do
+        origins 'localhost:3001'
+        resource '*',
+          headers: :any,
+          methods: [:get, :post, :put, :patch, :delete, :options, :head]
+      end
+    end
+    TEXT
+  end
+
+  # Create the example API controller file
+  create_file "app/controllers/api/v1/examples_controller.rb", <<-TEXT
+module Api
+  module V1
+    class ExamplesController < ApplicationController
+      def index
+        render json: { message: "Hello from Rails #{Rails.version}" }
+      end
+    end
+  end
+end
+  TEXT
+
+  # Create the example API route
+  route <<-TEXT
+namespace :api do
+  namespace :v1 do
+    resources 'examples', only: [:index]
+  end
+end
+  TEXT
+
+  # Create the Procfile
+  create_file "Procfile", <<-TEXT
+backend: rails s -p 3000
+frontend: cd ../frontend && npm run dev
+  TEXT
+end

data/assets/page.js

@@ -18,6 +18,7 @@ export default function Home() {
 
   return (
     <Page
+      backendUrl="http://localhost:3000"
       logoDark={logoDark}
       logoLight={logoLight}
       metadata={metadata}

data/bin/layered_stack

@@ -1,3 +1,3 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby -wU
 require 'layered_stack'
-LayeredStack::Cli::Runner.start(ARGV)
+LayeredStack::Cli.start(ARGV)

data/lib/layered_stack/backend/create.rb

@@ -0,0 +1,42 @@
+require 'fileutils'
+require 'thor'
+require 'logger'
+
+module LayeredStack
+  module Backend
+    class Create < Thor
+      def self.execute
+        new.execute
+      end
+
+      no_commands do
+        def execute
+          check_and_remove_backend
+          create_new_backend
+        end
+
+        private
+
+        def logger
+          @logger ||= Logger.new(STDOUT)
+        end
+
+        def run_command(command, message)
+          logger.info(message)
+          system(command)
+        end
+
+        def check_and_remove_backend
+          if Dir.exist?('backend')
+            run_command('rm -rf backend', 'Removing backend directory')
+          end
+        end
+
+        def create_new_backend
+          template_path = File.expand_path('../../../assets/backend/template.rb', __dir__)
+          run_command("rails new backend --minimal --devcontainer --template=#{template_path}", 'Creating new Rails application named backend')
+        end
+      end
+    end
+  end
+end

data/lib/layered_stack/backend/start.rb

@@ -0,0 +1,30 @@
+require 'thor'
+require 'logger'
+
+module LayeredStack
+  module Backend
+    class Start < Thor
+      def self.execute
+        new.execute
+      end
+
+      no_commands do
+        def execute
+          logger.info("> layered_stack/frontend/start")
+          run_command('code backend', 'Starting VS Code in /backend directory')
+        end
+
+        private
+
+        def logger
+          @logger ||= Logger.new(STDOUT)
+        end
+
+        def run_command(command, message)
+          logger.info(message)
+          system(command)
+        end
+      end
+    end
+  end
+end

data/lib/layered_stack/frontend/create.rb

@@ -0,0 +1,137 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'thor'
+require 'logger'
+
+module LayeredStack
+  module Frontend
+    class Create < Thor
+      CREATE_NEXT_APP_SWITCHES = "--js --tailwind --eslint --app --src-dir --import-alias @/* --use-npm"
+
+      FRONTEND_DIR = "frontend"
+
+      def self.asset_path(relative_path)
+        File.expand_path("../../../../assets/#{relative_path}", __FILE__)
+      end
+
+      ASSET_FILES = {
+        asset_path("tailwind.config.js") => "frontend/tailwind.config.js",
+        asset_path("layout.js") => "frontend/src/app/layout.js",
+        asset_path("page.js") => "frontend/src/app/page.js",
+        asset_path("images/logo_dark.svg") => "frontend/src/app/logo_dark.svg",
+        asset_path("images/logo_light.svg") => "frontend/src/app/logo_light.svg",
+      }
+
+      LOGO_FILES = {
+        "assets/images/logo_dark.svg" => "frontend/src/app/logo_dark.svg",
+        "assets/images/logo_light.svg" => "frontend/src/app/logo_light.svg",
+      }
+
+      def self.execute
+        new.execute
+      end
+
+      no_commands do
+        def execute
+          logger.info("> layered_stack/create")
+          remove_existing_frontend
+          run_create_next_app
+          Dir.chdir(FRONTEND_DIR) do
+            install_dependencies
+            update_package_json
+          end
+          copy_asset_files
+          copy_logo_files
+          print_next_step
+        end
+
+        private
+
+        def logger
+          @logger ||= Logger.new(STDOUT)
+        end
+
+        def remove_existing_frontend
+          if Dir.exist?(FRONTEND_DIR)
+            logger.info("\n# Removing existing /#{FRONTEND_DIR} directory")
+            FileUtils.rm_rf(FRONTEND_DIR)
+          end
+        end
+
+        def run_create_next_app
+          command = "npx create-next-app@latest #{CREATE_NEXT_APP_SWITCHES} #{FRONTEND_DIR}"
+          run_command(command, "Running create-next-app")
+        end
+
+        def install_dependencies
+          dependencies = [
+            "next-themes",
+            "@heroicons/react@latest",
+            "@layeredstack/ui@latest"
+          ]
+          dependencies.each do |dep|
+            run_command("npm install #{dep}", "Installing #{dep}")
+          end
+        end
+
+        def update_package_json
+          logger.info("# Updating package.json to change the port to 3001")
+          update_file("package.json", '"dev": "next dev"', '"dev": "next dev -p 3001"')
+          update_file("package.json", '"start": "next start"', '"start": "next start -p 3001"')
+        end
+
+        def copy_asset_files
+          logger.info("\n# Copying asset files to the frontend directory")
+          copy_files(ASSET_FILES)
+        end
+
+        def copy_logo_files
+          logger.info("\n# Copying logo files to the frontend directory")
+          copy_files(LOGO_FILES) { |src, dest| copy_logo_file(src, dest) }
+        end
+
+        def copy_files(files)
+          files.each do |src, dest|
+            if block_given?
+              yield(src, dest)
+            else
+              FileUtils.cp(src, dest)
+            end
+          end
+        end
+
+        def copy_logo_file(src, dest)
+          if File.exist?(src)
+            logger.info("User provided logo exists in assets, copying #{src} to #{dest}")
+            FileUtils.cp(src, dest)
+          else
+            template_src = ASSET_FILES.find { |k, _| k.include?(File.basename(src)) }&.first
+            if template_src
+              logger.info("No user provided logo found in 'assets/images/', copying default logo from #{template_src} to #{dest}")
+              FileUtils.cp(template_src, dest)
+            else
+              logger.warn("Default logo file #{src} not found")
+            end
+          end
+        end
+
+        def run_command(command, message)
+          logger.info(message)
+          system(command)
+        end
+
+        def update_file(file, old_content, new_content)
+          content = File.read(file)
+          new_content = content.gsub(old_content, new_content)
+          File.write(file, new_content)
+        end
+
+        def print_next_step
+          logger.info("\n# Next step:")
+          logger.info("bundle exec layered_stack frontend start")
+        end
+      end
+    end
+  end
+end

data/lib/layered_stack/frontend/start.rb

@@ -0,0 +1,33 @@
+require 'thor'
+require 'logger'
+
+module LayeredStack
+  module Frontend
+    class Start < Thor
+      def self.execute
+        new.execute
+      end
+
+      no_commands do
+        def execute
+          logger.info("> layered_stack/frontend/start")
+          run_command('code frontend', 'Starting VS Code in frontend directory', 'Failed to start VS Code')
+        end
+
+        private
+
+        def logger
+          @logger ||= Logger.new(STDOUT)
+        end
+
+        def run_command(command, success_message, error_message)
+          if system(command)
+            logger.info(success_message)
+          else
+            logger.error(error_message)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/layered_stack/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LayeredStack
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/layered_stack.rb

@@ -4,22 +4,45 @@ require 'thor'
 Dir[File.join(__dir__, 'layered_stack/**/*.rb')].each { |file| require_relative file }
 
 module LayeredStack
-  module Cli
-    class Runner < Thor
-      desc "hello", "say hello"
-      def hello(name)
-        puts "> layered_stack/hello"
-        puts "Hello #{name} from Layered Stack CLI version #{LayeredStack::VERSION}!"
+  class Cli < Thor
+    desc "start", "Start"
+    def start
+      Frontend.new.start
+      Backend.new.start
+    end
+
+    class Frontend < Thor
+      namespace :frontend
+
+      desc "create", "Create"
+      def create
+        LayeredStack::Frontend::Create.execute
+      end
+
+      desc "start", "Start"
+      def start
+        LayeredStack::Frontend::Start.execute
       end
 
+      desc "create_and_start", "Create and start"
+      def create_and_start
+        create
+        start
+      end
+    end
+    register(Frontend, 'frontend', 'frontend [COMMAND]', 'Commands for the frontend')
+
+    class Backend < Thor
+      namespace :backend
+
       desc "create", "Create"
       def create
-        LayeredStack::Cli::Commands::CreateCommand.execute
+        LayeredStack::Backend::Create.execute
       end
 
       desc "start", "Start"
       def start
-        LayeredStack::Cli::Commands::StartCommand.execute
+        LayeredStack::Backend::Start.execute
       end
 
       desc "create_and_start", "Create and start"
@@ -28,5 +51,6 @@ module LayeredStack
         start
       end
     end
+    register(Backend, 'backend', 'backend [COMMAND]', 'Commands for the backend')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: layered_stack
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Layered Stack
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-05 00:00:00.000000000 Z
+date: 2024-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.2
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.0.0
 description: CLI for Layered Stack
 email:
 - support@layeredstack.com
@@ -32,6 +46,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- assets/backend/template.rb
 - assets/images/logo_dark.svg
 - assets/images/logo_light.svg
 - assets/layout.js
@@ -39,8 +54,10 @@ files:
 - assets/tailwind.config.js
 - bin/layered_stack
 - lib/layered_stack.rb
-- lib/layered_stack/commands/create_command.rb
-- lib/layered_stack/commands/start_command.rb
+- lib/layered_stack/backend/create.rb
+- lib/layered_stack/backend/start.rb
+- lib/layered_stack/frontend/create.rb
+- lib/layered_stack/frontend/start.rb
 - lib/layered_stack/version.rb
 homepage: https://www.layeredstack.com/
 licenses:
@@ -63,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Layered Stack CLI

data/lib/layered_stack/commands/create_command.rb

@@ -1,139 +0,0 @@
-# frozen_string_literal: true
-
-require 'fileutils'
-require 'thor'
-require 'logger'
-
-module LayeredStack
-  module Cli
-    module Commands
-      class CreateCommand < Thor
-        CREATE_NEXT_APP_SWITCHES = "--js --tailwind --eslint --app --src-dir --import-alias @/* --use-npm"
-
-        FRONTEND_DIR = "frontend"
-
-        def self.asset_path(relative_path)
-          File.expand_path("../../../../assets/#{relative_path}", __FILE__)
-        end
-
-        ASSET_FILES = {
-          asset_path("tailwind.config.js") => "frontend/tailwind.config.js",
-          asset_path("layout.js") => "frontend/src/app/layout.js",
-          asset_path("page.js") => "frontend/src/app/page.js",
-          asset_path("images/logo_dark.svg") => "frontend/src/app/logo_dark.svg",
-          asset_path("images/logo_light.svg") => "frontend/src/app/logo_light.svg",
-        }
-
-        LOGO_FILES = {
-          "assets/images/logo_dark.svg" => "frontend/src/app/logo_dark.svg",
-          "assets/images/logo_light.svg" => "frontend/src/app/logo_light.svg",
-        }
-
-        def self.execute
-          new.execute
-        end
-
-        no_commands do
-          def execute
-            logger.info("> layered_stack/create")
-            remove_existing_frontend
-            run_create_next_app
-            Dir.chdir(FRONTEND_DIR) do
-              install_dependencies
-              update_package_json
-            end
-            copy_asset_files
-            copy_logo_files
-            print_next_step
-          end
-
-          private
-
-          def logger
-            @logger ||= Logger.new(STDOUT)
-          end
-
-          def remove_existing_frontend
-            if Dir.exist?(FRONTEND_DIR)
-              logger.info("\n# Removing existing /#{FRONTEND_DIR} directory")
-              FileUtils.rm_rf(FRONTEND_DIR)
-            end
-          end
-
-          def run_create_next_app
-            command = "npx create-next-app@latest #{CREATE_NEXT_APP_SWITCHES} #{FRONTEND_DIR}"
-            run_command(command, "Running create-next-app")
-          end
-
-          def install_dependencies
-            dependencies = [
-              "next-themes",
-              "@heroicons/react@latest",
-              "@layeredstack/ui@latest"
-            ]
-            dependencies.each do |dep|
-              run_command("npm install #{dep}", "Installing #{dep}")
-            end
-          end
-
-          def update_package_json
-            logger.info("# Updating package.json to change the port to 3001")
-            update_file("package.json", '"dev": "next dev"', '"dev": "next dev -p 3001"')
-            update_file("package.json", '"start": "next start"', '"start": "next start -p 3001"')
-          end
-
-          def copy_asset_files
-            logger.info("\n# Copying asset files to the frontend directory")
-            copy_files(ASSET_FILES)
-          end
-
-          def copy_logo_files
-            logger.info("\n# Copying logo files to the frontend directory")
-            copy_files(LOGO_FILES) { |src, dest| copy_logo_file(src, dest) }
-          end
-
-          def copy_files(files)
-            files.each do |src, dest|
-              if block_given?
-                yield(src, dest)
-              else
-                FileUtils.cp(src, dest)
-              end
-            end
-          end
-
-          def copy_logo_file(src, dest)
-            if File.exist?(src)
-              logger.info("User provided logo exists in assets, copying #{src} to #{dest}")
-              FileUtils.cp(src, dest)
-            else
-              template_src = ASSET_FILES.find { |k, _| k.include?(File.basename(src)) }&.first
-              if template_src
-                logger.info("No user provided logo found in 'assets/images/', copying default logo from #{template_src} to #{dest}")
-                FileUtils.cp(template_src, dest)
-              else
-                logger.warn("Default logo file #{src} not found")
-              end
-            end
-          end
-
-          def run_command(command, message)
-            logger.info(message)
-            system(command)
-          end
-
-          def update_file(file, old_content, new_content)
-            content = File.read(file)
-            new_content = content.gsub(old_content, new_content)
-            File.write(file, new_content)
-          end
-
-          def print_next_step
-            logger.info("\n# Next step:")
-            logger.info("bundle exec layered_stack start")
-          end
-        end
-      end
-    end
-  end
-end

data/lib/layered_stack/commands/start_command.rb

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-require 'thor'
-require 'logger'
-
-module LayeredStack
-  module Cli
-    module Commands
-      class StartCommand < Thor
-        FRONTEND_DIR = "frontend"
-        LOCALHOST_URL = "http://localhost:3001"
-
-        def self.execute
-          new.execute
-        end
-
-        no_commands do
-          def execute
-            logger.info("> layered_stack/start")
-
-            if change_directory
-              open_browser
-              run_development_server
-            end
-          end
-
-          private
-
-          def logger
-            @logger ||= Logger.new(STDOUT)
-          end
-
-          def change_directory
-            if Dir.exist?(FRONTEND_DIR)
-              begin
-                Dir.chdir(FRONTEND_DIR)
-                logger.info("Changed directory to '#{FRONTEND_DIR}'")
-                true
-              rescue => e
-                logger.error("Failed to change directory: #{e.message}")
-                false
-              end
-            else
-              logger.error("Directory '#{FRONTEND_DIR}' does not exist")
-              false
-            end
-          end
-
-          def open_browser
-            logger.info("\n# Opening the browser")
-            run_command("open #{LOCALHOST_URL}", "Browser opened successfully", "Failed to open the browser")
-          end
-
-          def run_development_server
-            logger.info("\n# Running the development server")
-            run_command("npm run dev", "Development server started successfully", "Failed to start the development server")
-          end
-
-          def run_command(command, success_message, error_message)
-            if system(command)
-              logger.info(success_message)
-            else
-              logger.error(error_message)
-            end
-          end
-        end
-      end
-    end
-  end
-end