ottogen 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d2c2145453e01eb5836e6a495eb9a536406c6ced7dd5114e30a298aece2fa42
-  data.tar.gz: f1b3637628cb624f3ca325498b65c8b9e3d60b7cf0597bde35f1c19bffbad357
+  metadata.gz: 9b34377b90101dd7d052eebf2846afb77637ddfbd4e6e21015a93237d0ef4a20
+  data.tar.gz: 311b1d378b4bcaa1a6b220f01a1fe17fdcc05628a4bac5f76a0e368d076b81cc
 SHA512:
-  metadata.gz: 4170d7093922f3c13d4a163cd1a60d7e7dcac8092c56391f3a5bec18f01db1478e646906307d885a873a4ad06d2bb501181aa82de53fc55653085189a4644e75
-  data.tar.gz: 8dc0552b797674bb2223a95b5d2167813f17d83e136999c747bfd2137c48aa923a513ab3e2ad37766c67b3774fb9801cfd8ec774eb98dc1dc3dd7a9138bdc650
+  metadata.gz: 0a3f16584748a1670aa78f3f0303a4332003ffd3f25891d3e433471a07b671113e705b53b5a073b249d1c817510942331e5ba005728762c0e7d873997859f86e
+  data.tar.gz: 86cbc9e917ec3d3f4a9d8c82148c7dddebc1d4f06043a085a9d2395e8c986cd09f134351a01dde64fd16a455cc241ba926b3941b88924d062a1941f5b2b4c8d5

data/lib/ottogen/otto.rb

@@ -1,12 +1,11 @@
 require 'thor'
-require 'webrick'
 require_relative './ottogen'
 
 module Ottogen
   class Otto < Thor
-    desc "init", "Initialize static site"
-    def init
-      Ottogen.init
+    desc "init [DIR]", "Initialize a new otto static site in DIR (defaults to the current directory)"
+    def init(dir=nil)
+      Ottogen.init(dir)
     end
 
     desc "build", "Build the static site"
@@ -14,6 +13,15 @@ module Ottogen
       Ottogen.build
     end
 
+    map "b" => :build
+
+    desc "generate PAGE", "Generate a new page"
+    def generate(page)
+      Ottogen.generate(page)
+    end
+
+    map "g" => :generate
+
     desc "clean", "Clean the static site"
     def clean
       Ottogen.clean
@@ -26,10 +34,9 @@ module Ottogen
 
     desc "serve", "Serve the static site"
     def serve
-      root = File.expand_path("#{Dir.pwd}/#{Ottogen::BUILD_DIR}")
-      server = WEBrick::HTTPServer.new :Port => 8778, :DocumentRoot => root
-      trap 'INT' do server.shutdown end
-      server.start
+      Ottogen.serve
     end
+
+    map "s" => :serve
   end
 end

data/lib/ottogen/ottogen.rb

@@ -1,45 +1,88 @@
 require 'asciidoctor'
 require 'fileutils'
 require 'listen'
+require 'webrick'
 
 module Ottogen
   class Ottogen
     BUILD_DIR = '_build'.freeze
+    CONFIG = <<~YAML
+title: "Otto site"
+YAML
     WELCOME = <<~ADOC
 = Welcome to Otto!
 
 Otto is a static site generator that uses AsciiDoc as a markup language.
 ADOC
 
-    def self.init
-      puts "✨ ..."
-      File.write("index.adoc", WELCOME)
+    def self.init(dir)
+      puts "✨ Initializing static site..."
+      if !dir.nil? and Dir.exist?(dir)
+        puts "❌ Error: Directory already exists"
+        exit(1)
+      end
+
+      if dir.nil?
+        files_in_current_dir = Dir.glob('**/*')
+        if !files_in_current_dir.empty?
+          puts "❌ Error: Directory must be empty"
+          exit(1)
+        end
+        init_in_current_dir
+      else
+        init_with_dir(dir)
+      end
+
       puts "✅"
     end
 
     def self.build
-      puts "🔨 ..."
+      puts "🔨 Building static site..."
+      error_if_not_otto_project
       Dir.mkdir(BUILD_DIR) unless Dir.exist?(BUILD_DIR)
-      Dir.glob('**/*.adoc').map do |name|
+      FileUtils.cp_r 'assets/', "#{BUILD_DIR}/assets"
+      Dir.glob('pages/**/*.adoc').map do |name|
         name.split('.').first
       end.each do |doc|
+        page = doc.sub(/^pages\//, '')
         Asciidoctor.convert_file "#{doc}.adoc",
                                  safe: :safe,
                                  mkdirs: true,
-                                 to_file: "#{BUILD_DIR}/#{doc}.html"
+                                 to_file: "#{BUILD_DIR}/#{page}.html"
       end
       puts "✅"
     end
 
+    def self.generate(page)
+      puts "📝 Generating a new page..."
+      error_if_not_otto_project
+      page_title = page.split('-').map(&:capitalize).join(' ')
+      File.write("pages/#{page}.adoc", "= #{page_title}\n")
+    end
+
     def self.clean
-      puts "🧽 ..."
+      puts "🧽 Cleaning build directory..."
+      error_if_not_otto_project
       return unless Dir.exist?(BUILD_DIR)
       FileUtils.rmtree(BUILD_DIR)
       puts "✅"
     end
 
+    def self.serve
+      puts "🤖 Starting server..."
+      error_if_not_otto_project
+      root = File.expand_path("#{Dir.pwd}/#{Ottogen::BUILD_DIR}")
+      server = WEBrick::HTTPServer.new :Port => 8778, :DocumentRoot => root
+      trap 'INT' do server.shutdown end
+      server.start
+    rescue Errno::EADDRINUSE
+      puts "❌ Server port already in use"
+      exit(1)
+    end
+
     def self.watch
       puts "👀 Watching files..."
+      error_if_not_otto_project
       listener = Listen.to(Dir.pwd, ignore: [/_build/]) do |modified, added, removed|
         puts(modified: modified, added: added, removed: removed)
         build
@@ -47,5 +90,31 @@ ADOC
       listener.start
       sleep
     end
+
+    private
+
+    def self.init_with_dir(dir)
+      Dir.mkdir(dir)
+      FileUtils.touch("#{dir}/.otto")
+      File.write("#{dir}/config.yml", CONFIG)
+      FileUtils.mkdir_p("#{dir}/assets")
+      FileUtils.mkdir_p("#{dir}/pages")
+      File.write("#{dir}/pages/index.adoc", WELCOME)
+    end
+
+    def self.init_in_current_dir
+      FileUtils.touch(".otto")
+      File.write("config.yml", CONFIG)
+      FileUtils.mkdir_p("assets")
+      FileUtils.mkdir_p("pages")
+      File.write("pages/index.adoc", WELCOME)
+    end
+
+    def self.error_if_not_otto_project
+      if !File.exist?(".otto")
+        puts "❌ Error: Current directory is not an otto project"
+        exit(1)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ottogen
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ian Johnson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-17 00:00:00.000000000 Z
+date: 2025-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec