layered_stack 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c091642cbebee58e4c06859d105b57dd1594a77078ef11dc1134c9cfef9b11a2
-  data.tar.gz: 19ba1a7c753c95805cea40e656bf8e6d0c3227eb6ffefe810454c336e3107507
+  metadata.gz: 6919ea27bbae60e44f91632de5468b13d525a44a55d3b95d768bd2516fd4c8c5
+  data.tar.gz: a1aec4ec02a336ea73c7c5be3cb41083ee95566b62be970a160b35983205e905
 SHA512:
-  metadata.gz: 8d95dd832e4b1baa5829c37be7685fa93a26f1035231f1ea361e310bcc0b080b64f7a1defdfc99c3e215aff013f618b3c4c638d18fcc181f775bc9f66f785487
-  data.tar.gz: 40fe9c64ad0061aba2780d0993f09b334b6e377cc8eaef6c0b9d99554c1c377028231d67e7f735f3612e46aa2e3a7dd96917cfe3ed0dcaf6956005d559879f0e
+  metadata.gz: f667ee0d4e7f5a05787fc4531c92d79c730b0b541c145525aeb675ec973120e483a143b61caba6903c7b00cfa4f2db5864213e58d8664ae2e53921886cac22f1
+  data.tar.gz: e91a6f41a8b8d1aed68aacdad4990fa6b81818a6389c9522fe230563c7738b22a874a99cd2a839ffd5f6f579a914ed7fb51baa0f64ca450b366607e6297dac43

data/assets/page.js

@@ -21,7 +21,7 @@ export default function Home() {
       logoDark={logoDark}
       logoLight={logoLight}
       metadata={metadata}
-      mobileMenuIcon={mobileMenuIcon}
+      // mobileMenuIcon={mobileMenuIcon}
       useTheme={useTheme}
       user={{
         initials: 'TG'

data/lib/layered_stack/commands/create_command.rb

@@ -2,6 +2,7 @@
 
 require 'fileutils'
 require 'thor'
+require 'logger'
 
 module LayeredStack
   module Cli
@@ -11,12 +12,16 @@ module LayeredStack
 
         FRONTEND_DIR = "frontend"
 
+        def self.asset_path(relative_path)
+          File.expand_path("../../../../assets/#{relative_path}", __FILE__)
+        end
+
         ASSET_FILES = {
-          File.expand_path("../../../../assets/tailwind.config.js", __FILE__) => "frontend/tailwind.config.js",
-          File.expand_path("../../../../assets/layout.js", __FILE__) => "frontend/src/app/layout.js",
-          File.expand_path("../../../../assets/page.js", __FILE__) => "frontend/src/app/page.js",
-          File.expand_path("../../../../assets/images/logo_dark.svg", __FILE__) => "frontend/src/app/logo_dark.svg",
-          File.expand_path("../../../../assets/images/logo_light.svg", __FILE__) => "frontend/src/app/logo_light.svg",
+          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 = {
@@ -30,23 +35,27 @@ module LayeredStack
 
         no_commands do
           def execute
-            puts "> layered_stack/create"
+            logger.info("> layered_stack/create")
             remove_existing_frontend
             run_create_next_app
             Dir.chdir(FRONTEND_DIR) do
               install_dependencies
               update_package_json
             end
-            copy_template_files
+            copy_asset_files
             copy_logo_files
-            print_next_steps
+            print_next_step
           end
 
           private
 
+          def logger
+            @logger ||= Logger.new(STDOUT)
+          end
+
           def remove_existing_frontend
             if Dir.exist?(FRONTEND_DIR)
-              puts "\n# Removing existing /#{FRONTEND_DIR} directory"
+              logger.info("\n# Removing existing /#{FRONTEND_DIR} directory")
               FileUtils.rm_rf(FRONTEND_DIR)
             end
           end
@@ -57,60 +66,71 @@ module LayeredStack
           end
 
           def install_dependencies
-            run_command("npm install next-themes", "Installing next-themes")
-            run_command("npm install @heroicons/react@latest", "Installing @heroicons/react@latest")
-            run_command("npm install @layeredstack/ui@latest", "Installing @layeredstack/ui@latest")
+            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
-            puts "# Updating package.json to change the port to 3001"
+            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_template_files
-            puts "\n# Copying template files to the frontend directory"
-
-            ASSET_FILES.each do |src, dest|
-              FileUtils.cp(src, dest)
-            end
+          def copy_asset_files
+            logger.info("\n# Copying asset files to the frontend directory")
+            copy_files(ASSET_FILES)
           end
 
           def copy_logo_files
-            puts "\n# Copying logo files to the frontend directory"
+            logger.info("\n# Copying logo files to the frontend directory")
+            copy_files(LOGO_FILES) { |src, dest| copy_logo_file(src, dest) }
+          end
 
-            LOGO_FILES.each do |src, dest|
-              copy_logo_file(src, dest)
+          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)
-              puts "User provided logo exists in assets, copying #{src} to #{dest}"
+              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
-                puts "Copying default logo #{template_src} to #{dest}"
+                logger.info("No user provided logo found in 'assets/images/', copying default logo from #{template_src} to #{dest}")
                 FileUtils.cp(template_src, dest)
               else
-                puts "Default logo for #{src} not found"
+                logger.warn("Default logo file #{src} not found")
               end
             end
           end
 
-          def print_next_steps
-            puts "\n# Start the project with the following command:"
-            puts "bundle exec layered_stack start"
+          def run_command(command, message)
+            logger.info(message)
+            system(command)
           end
 
-          def run_command(command, description)
-            puts "\n# #{description}"
-            system(command) || abort("Failed to execute: #{command}")
+          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 update_file(file, pattern, replacement)
-            system("sed -i '' 's/#{pattern}/#{replacement}/' #{file}") || abort("Failed to update #{file}")
+          def print_next_step
+            logger.info("\n# Next step:")
+            logger.info("bundle exec layered_stack start")
           end
         end
       end

data/lib/layered_stack/commands/start_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 require 'logger'
 
@@ -5,6 +7,9 @@ module LayeredStack
   module Cli
     module Commands
       class StartCommand < Thor
+        FRONTEND_DIR = "frontend"
+        LOCALHOST_URL = "http://localhost:3001"
+
         def self.execute
           new.execute
         end
@@ -26,36 +31,36 @@ module LayeredStack
           end
 
           def change_directory
-            if Dir.exist?("frontend")
+            if Dir.exist?(FRONTEND_DIR)
               begin
-                Dir.chdir("frontend")
-                logger.info("Changed directory to 'frontend'")
+                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' does not exist")
+              logger.error("Directory '#{FRONTEND_DIR}' does not exist")
               false
             end
           end
 
           def open_browser
             logger.info("\n# Opening the browser")
-            if system("open http://localhost:3001")
-              logger.info("Browser opened successfully")
-            else
-              logger.error("Failed to open the browser")
-            end
+            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")
-            if system("npm run dev")
-              logger.info("Development server started successfully")
+            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("Failed to start the development server")
+              logger.error(error_message)
             end
           end
         end

data/lib/layered_stack/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: layered_stack
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Layered Stack