9 files changed, 119 insertions, 26 deletions

@@ -2,7 +2,7 @@
 
 NAME = jimmy
 CSC = /usr/bin/csc
-CSC_OPTIONS = -setup-mode -host -I $(PWD) -C -I$(PWD)
+CSC_OPTIONS = -setup-mode -host -I $(PWD) -C -I$(BUILD)
 CSC_LIB_OPTIONS = -D compiling-extension -emit-all-import-libraries -dynamic -regenerate-import-libraries
 CSC_OPTIONS_EXTRA = -X utf8 -X module-declarations
 CSI = /usr/bin/csi
@@ -12,7 +12,7 @@ TEST_ENV = env BUILD=$(BUILD) TESTS=$(TESTS)
 TEST_ENV_EXTRA = TEST_USE_ANSI=0
 
 .PHONY: all test clean install uninstall
-all: build/jimmy.util.so build/jimmy.read.so build/jimmy.emit.so build/jimmy.html.so build/jimmy.wrap.so
+all: build/jimmy.util.so build/jimmy.read.so build/jimmy.emit.so build/jimmy.html.so build/jimmy.wrap.so build/jimmy.main.so build/jimmy
 test: all
         cd $(BUILD) && $(TEST_ENV) $(TEST_ENV_EXTRA) $(CSI) -setup-mode -s $(TESTS)/run.scm $(NAME)
 clean:
@@ -24,28 +24,38 @@ uninstall:
 
 # jimmy
 
-build/jimmy.util.so: src/util.scm
+build/jimmy.util.so: lib/util.scm
         @mkdir -p $(BUILD)
-        cd $(BUILD) && \
-        $(CSC) $(CSC_OPTIONS) $(CSC_LIB_OPTIONS) $(CSC_OPTIONS_EXTRA) ../$< -o $(@F)
+        $(CSC) $(CSC_OPTIONS) $(CSC_LIB_OPTIONS) $(CSC_OPTIONS_EXTRA) $< -o $@
         @test -f jimmy.util.import.scm &&mv jimmy.util.import.scm $(BUILD)/||true
-build/jimmy.read.so: src/read.scm src/util.scm
+
+build/jimmy.read.so: lib/read.scm lib/util.scm
         @mkdir -p $(BUILD)
-        cd $(BUILD) && \
-        $(CSC) $(CSC_OPTIONS) $(CSC_LIB_OPTIONS) $(CSC_OPTIONS_EXTRA) ../$< -o $(@F)
+        $(CSC) $(CSC_OPTIONS) $(CSC_LIB_OPTIONS) $(CSC_OPTIONS_EXTRA) $< -o $@
         @test -f jimmy.read.import.scm &&mv jimmy.read.import.scm $(BUILD)/||true
-build/jimmy.emit.so: src/emit.scm src/util.scm
+
+build/jimmy.emit.so: lib/emit.scm lib/util.scm
         @mkdir -p $(BUILD)
-        cd $(BUILD) && \
-        $(CSC) $(CSC_OPTIONS) $(CSC_LIB_OPTIONS) $(CSC_OPTIONS_EXTRA) ../$< -o $(@F)
+        $(CSC) $(CSC_OPTIONS) $(CSC_LIB_OPTIONS) $(CSC_OPTIONS_EXTRA) $< -o $@
         @test -f jimmy.emit.import.scm &&mv jimmy.emit.import.scm $(BUILD)/||true
-build/jimmy.html.so: src/html.scm src/util.scm src/emit.scm
+
+build/jimmy.html.so: lib/html.scm lib/util.scm lib/emit.scm
         @mkdir -p $(BUILD)
-        cd $(BUILD) && \
-        $(CSC) $(CSC_OPTIONS) $(CSC_LIB_OPTIONS) $(CSC_OPTIONS_EXTRA) ../$< -o $(@F)
+        $(CSC) $(CSC_OPTIONS) $(CSC_LIB_OPTIONS) $(CSC_OPTIONS_EXTRA) $< -o $@
         @test -f jimmy.html.import.scm &&mv jimmy.html.import.scm $(BUILD)/||true
-build/jimmy.wrap.so: src/wrap.scm src/util.scm src/emit.scm
+
+build/jimmy.wrap.so: lib/wrap.scm lib/util.scm lib/emit.scm
         @mkdir -p $(BUILD)
-        cd $(BUILD) && \
-        $(CSC) $(CSC_OPTIONS) $(CSC_LIB_OPTIONS) $(CSC_OPTIONS_EXTRA) ../$< -o $(@F)
+        $(CSC) $(CSC_OPTIONS) $(CSC_LIB_OPTIONS) $(CSC_OPTIONS_EXTRA) $< -o $@
         @test -f jimmy.wrap.import.scm &&mv jimmy.wrap.import.scm $(BUILD)/||true
+
+build/jimmy.main.so: lib/main.scm lib/util.scm lib/emit.scm lib/read.scm lib/wrap.scm
+        @mkdir -p $(BUILD)
+        $(CSC) $(CSC_OPTIONS) $(CSC_LIB_OPTIONS) $(CSC_OPTIONS_EXTRA) $< -o $@
+        @test -f jimmy.main.import.scm &&mv jimmy.main.import.scm $(BUILD)/||true
+
+build/jimmy: bin/jimmy.scm lib/main.scm
+        @mkdir -p $(BUILD)
+        $(CSC) $(CSC_OPTIONS) $(CSC_OPTIONS_EXTRA) $< -o $@
+        @test -f jimmy.import.scm &&mv jimmy.import.scm $(BUILD)/||true
+
@@ -0,0 +1,48 @@
+;;; (jimmy main) --- the program
+
+(import (chicken file)
+        (chicken port)
+        (chicken process-context)
+        (jimmy main)
+        args)
+
+(define opts
+  (list (args:make-option (t to) (required: "FORMAT")
+                          (string-append "Translate input to FORMAT."
+                                         " One of `gemini', `html', or"
+                                         " a filename."))
+        (args:make-option (n no-extensions) #:none
+                          "Don't use gemtext extensions.")
+        (args:make-option (T template) (required: "TEMPLATE")
+                          "Wrap the generated text in TEMPLATE.")
+        (args:make-option (h help) #:none "Display this text"
+                          (usage 0))))
+
+(define (usage #!optional (exit-code 1))
+  (with-output-to-port (current-error-port)
+    (lambda ()
+      (print "Usage: " (car (argv)) " [OPTIONS...] [FILE]")
+      (newline)
+      (print (args:usage options))
+      (print "Report bugs to acdw@acdw.net.")))
+  (exit exit-code))
+
+(define (main args)
+  (receive (options operands) (args:parse args opts)
+    (let ((to (alist-ref 'to options))
+          (template (alist-ref 'template options)))
+
+      (cond
+       ((not to))                       ; default: gemini
+       ((equal? to "html")
+        (import (jimmy html)))
+       ((file-exists? to)
+        (load to))
+       (else (error "File does not exist" to)))
+
+      (print (apply jimmy (list (car operands) template))))))
+
+(cond-expand
+  (compiling
+   (main (command-line-arguments)))
+  (else))
@@ -2,6 +2,7 @@
  (synopsis "The ssg king")
  (license "BSD-3-clause")
  (dependencies (chicken "5.3.0")
+               args                     ; for (jimmy main)
                module-declarations
                utf8)
  (test-dependencies test)
@@ -10,22 +11,34 @@
  (components
   ;; Utility library
   (extension jimmy.util
-             (source src/util.scm))
+             (source lib/util.scm))
   ;; Read gemini files into internal format
   (extension jimmy.read
-             (source src/read.scm)
+             (source lib/read.scm)
              (component-dependencies jimmy.util))
   ;; Emit the output format (includes gemini)
   (extension jimmy.emit
-             (source src/emit.scm)
+             (source lib/emit.scm)
              (component-dependencies jimmy.util))
   ;; Emit HTML -- import this *after* emit (is this the best way?)
   (extension jimmy.html
-             (source src/html.scm)
+             (source lib/html.scm)
              (component-dependencies jimmy.util
                                      jimmy.emit))
   ;; Wrap output in templates
   (extension jimmy.wrap
-             (source src/wrap.scm)
+             (source lib/wrap.scm)
              (component-dependencies jimmy.util
-                                     jimmy.emit))))
+                                     jimmy.emit))
+  ;; Main entry point (for command line)
+  (extension jimmy.main
+             (source lib/main.scm)
+             (component-dependencies jimmy.util
+                                     jimmy.emit
+                                     jimmy.read
+                                     jimmy.wrap))
+  ;; Command-line program
+  (program jimmy
+           (csc-options -static)
+           (source bin/jimmy.scm)
+           (component-dependencies jimmy.main))))
@@ -3,6 +3,7 @@
 (import scheme (chicken base)
         (chicken format)
         (chicken irregex)
+        (chicken port)
         (chicken string)
         (only utf8-srfi-13 string-join)
         (jimmy util))
@@ -10,6 +11,10 @@
 (define-public (emit doc)
   (for-each display (map format-stanza doc)))
 
+(define-public (emit-string doc)
+  (with-output-to-string
+    (lambda () (emit doc))))
+
 (define-public formats
   (make-parameter
    ;; (TYPE (line . LINE-FMT) (stanza . STANZA-FMT) (inline . INLINE-FMT))
@@ -0,0 +1,19 @@
+(declare (module (jimmy main)))
+
+(import scheme (chicken base)
+        (chicken port)
+        (jimmy util)
+        (jimmy read)
+        (jimmy emit)
+        (jimmy wrap))
+
+(define-public (jimmy #!optional file template)
+  (parameterize ((current-input-port
+                  (if file
+                      (open-input-file file)
+                      (current-input-port))))
+    (let ((doc (parse))
+          (post-proc (if template
+                         (cut wrap-with <> template)
+                         emit-string)))
+      (post-proc doc))))
@@ -14,9 +14,7 @@
                       (cons (string-append "{{" (car el) "}}")
                             (string-intersperse (cdr el) " ")))
                     (alist-walk document 'meta)))
-         (body (cons "{{body}}"
-                     (with-output-to-string
-                       (lambda () (emit document))))))
+         (body (cons "{{body}}" (emit-string document))))
     (string-translate* template (cons body meta))))
 
 (define-public (wrap-with document file)