paperwork 0.2.4 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5d904d85bcbd5a2ba7eca856dad8793b0e4eee24da094fbbc1fe774584eae0c
-  data.tar.gz: 1c33cc363286cc5413a321196719cfb6e9a36e61d5e29778491cca20ad7f67dc
+  metadata.gz: e485a22660790291fb8fc471ef6bbec18c5e8ef50bdebf8cbfac4fd5b90f1ebd
+  data.tar.gz: b275c2b329f53ca0c8584a596418c924183906a4df0cdedbb528ecb993024655
 SHA512:
-  metadata.gz: 40c2a56a01a32c60dbf5770d5875ab952a12cf808d5a5a1a0ab441e30daf53640114ddceb9d539d65770da8253df0800ccd067474dd89ae811924dd2420448a9
-  data.tar.gz: c46981794b979171ef040449fe987dfc2e2199cf8b7714f73b7b6a0fd176aeefe59fa596b763e9b388c8039b09ec0a5b8774465d9cebe58d5dfc2967d6426bc9
+  metadata.gz: 6331130f7d21e226dd7021ff8fd94823d98f518fe93f373329247a3a09fb4b7564f6338001df33aa48666fe145fd22a4a0b8b3836e34e4c55bb21a928b93b89e
+  data.tar.gz: 8d02e0938cbae8cf07448d829edafeb3385d8b794f32310c8b8d335f15ee667c99c2fb27c098c64ddf5c769f2aa33b2a4b18a9c29492597b4c6c3268586581f8

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    paperwork (0.2.4)
+    paperwork (0.3.2)
       rake (~> 12.3)
       redcarpet (~> 3.5.0)
+      thor (~> 1.1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -51,6 +52,7 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
     simplecov-html (0.12.2)
+    thor (1.1.0)
     unicode-display_width (1.7.0)
 
 PLATFORMS

data/Rakefile

@@ -13,4 +13,4 @@ task rebuild: [:clean, :build]
 task default: :spec
 CLEAN.include(".work/coverage")
 
-paperwork :doc, sources: ["README.md", "nested_example/navdemo.md", "site.yml", "custom.js", "custom.css"]
+paperwork :doc, sources: ["README.md", "nested_example/navdemo.md", "paperwork.yml", "custom.js", "custom.css"]

data/bin/paperwork

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "paperwork"
+
+Paperwork::CLI.start

data/lib/paperwork.rb

@@ -35,5 +35,7 @@ require "paperwork/tasks/root_helpers"
 require "paperwork/tasks/document"
 require "paperwork/tasks/template"
 
+require "paperwork/cli"
+
 
 include Paperwork # rubocop:disable Style/MixinUsage

data/lib/paperwork/cli.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+##
+# globla namespace for paperwork
+#
+module Paperwork
+    require "yaml"
+    require "thor"
+    require "paperwork"
+
+    ##
+    # command line interface for paperwork
+    #
+    class CLI < Thor
+        attr_accessor :config
+
+        CONFIG_FILE = "paperwork.yml"
+
+        class_option :verbose, aliases: "-v", desc: "be verbose about the build", type: :boolean, default: false
+
+        desc    "build",
+                <<~DESC
+                    creates documentation as defined in
+                    #{CONFIG_FILE} and writes it to
+                    '#{Paperwork::Config[:build_root]}/<name>/build'
+                DESC
+        def build
+            build_internal "build"
+        end
+
+        desc    "rebuild",
+                <<~DESC
+                    removes previous builds and creates
+                    documentation as defined in
+                    #{CONFIG_FILE} and writes it to
+                    '#{Paperwork::Config[:build_root]}/<name>/build'
+                DESC
+        def rebuild
+            build_internal "rebuild"
+        end
+
+        desc    "server",
+                "starts a aerver that serves documentation as defined in #{CONFIG_FILE}"
+        def server
+            build_internal "server"
+        end
+
+        protected
+
+        def build_internal(task)
+            setup_config
+            setup_tasks
+            invoke_tasks task
+        end
+
+        def setup_config
+            unless File.exist?(CONFIG_FILE)
+                raise Exception.new(
+                    "#{CONFIG_FILE} not found. You need to create a configuration file first."
+                )
+            end
+
+            yaml = YAML.load_file(CONFIG_FILE)
+            self.config = yaml["config"]
+            self.config["sources"] << CONFIG_FILE
+
+            return unless self.config.nil?
+
+            raise Exception.new(
+                "No 'config' found in #{CONFIG_FILE}. You need to describe the build setup in a 'config' section first."
+            )
+        end
+
+        def setup_tasks
+            paperwork self.config["name"], sources: self.config["sources"]
+        end
+
+        def invoke_tasks(target)
+            Rake::Task["paperwork:#{self.config["name"]}:set_verbose"].invoke if options[:verbose]
+            Rake::Task["paperwork:#{self.config["name"]}:#{target}"].invoke
+        end
+    end
+end

data/lib/paperwork/tasks/document.rb

@@ -9,7 +9,7 @@ module Paperwork
         ##
         # main task generator for building the document
         #
-        class Document < Paperwork::Tasks::Base
+        class Document < Paperwork::Tasks::Base # rubocop:disable Metrics/ClassLength
             attr_reader :dir
 
             include Rake::DSL
@@ -34,12 +34,18 @@ module Paperwork
 
             private
 
-            def get_destination(dst_base, src) # rubocop:disable Metrics/AbcSize
-                nested = File.dirname(src)
+            def get_destination(dst_base, src) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+                nested_base = File.dirname(src)
+                nested_base = if nested_base == "."
+                                  dst_base
+                              else
+                                  File.join(dst_base, nested_base)
+                              end
+
                 ext = File.extname(src)
                 case ext
                 when ".md"
-                    File.join(dst_base, nested, File.basename(src)).gsub(".md", ".html.md")
+                    File.join(nested_base, File.basename(src)).gsub(".md", ".html.md")
                 when ".scss"
                     Paperwork::Config[:custom_css] << File.basename(src, ext)
                     File.join(dst_base, "stylesheets", File.basename(src)).gsub(".scss", ".css.scss")
@@ -62,17 +68,16 @@ module Paperwork
                     task self.name => self.dependencies do
                         verbose_flag = Paperwork::Config[:verbose] ? " --verbose" : ""
                         Dir.chdir(self.dir) do
-                            Bundler.with_unbundled_env do
-                                Process.spawn(
-                                    "bundle exec middleman build#{verbose_flag}",
-                                    out: :out,
-                                    in: :in,
-                                    err: :err
-                                )
+                            cmd = "bundle exec middleman build#{verbose_flag}"
+                            if defined? Bundler
+                                Bundler.with_unbundled_env do
+                                    Process.spawn(cmd, out: :out, in: :in, err: :err)
+                                end
+                            else
+                                Process.spawn(cmd, out: :out, in: :in, err: :err)
                             end
                             Process.waitall
                         end
-
                         puts
                         puts "...Done!"
                         puts "build artifacts are located in #{File.join(self.dir, "build")}"
@@ -80,9 +85,9 @@ module Paperwork
                 end
             end
 
-            def tasks_nested # rubocop:disable Metrics/AbcSize
-                namespace :paperwork do
-                    namespace self.name do
+            def tasks_nested # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+                namespace :paperwork do # rubocop:disable Metrics/BlockLength
+                    namespace self.name do # rubocop:disable Metrics/BlockLength
                         task build: ["paperwork:#{self.name}"]
 
                         desc "rebuild documentation from scratch for '#{self.name}'"
@@ -99,6 +104,31 @@ module Paperwork
                         task :clean do
                             rm_rf self.dir
                         end
+
+                        desc "start middleman server for editing documents and get visual feedback with live reload"
+                        task server: :build do
+                            Dir.chdir(self.dir) do
+                                cmd = "bundle exec middleman server"
+                                if defined? Bundler
+                                    Bundler.with_unbundled_env do
+                                        Process.spawn(cmd, out: :out, in: :in, err: :err)
+                                    end
+                                else
+                                    Process.spawn(cmd, out: :out, in: :in, err: :err)
+                                end
+                                puts
+                                puts "+---------------------------------------------------------------+"
+                                puts "|                                                               |"
+                                puts "|  IMPORTANT:  Edit documents in #{self.dir} for live reload!   |"
+                                puts "|  ----------  The documents there are hard links to your       |"
+                                puts "|              source files, so the changes will be there       |"
+                                puts "|              as well.                                         |"
+                                puts "|                                                               |"
+                                puts "+---------------------------------------------------------------+"
+                                puts
+                                Process.waitall
+                            end
+                        end
                     end
                 end
             end

data/lib/paperwork/tasks/middleman_template/lib/doc_renderer.rb

@@ -85,7 +85,6 @@ module DocRenderer
             <<~IMG
                 <img src="#{relative_link link, scope.current_path}" alt="#{alt_text}" class="img-fluid">#{title}</img>
             IMG
-            #super(relative_link(link, scope.current_path), title, alt_text)
         end
 
         # def linebreak()

data/lib/paperwork/tasks/middleman_template/lib/info_helpers.rb

@@ -20,7 +20,7 @@ module InfoHelpers
         end
     end
 
-    def relative_link(stringifyable, current_path=current_page.path)
+    def relative_link(stringifyable, current_path = current_page.path)
         relative = String.new
         dots = current_path.split(/[\/\\]/).size - 1
         dots.times{ relative += "../" }
@@ -35,28 +35,29 @@ module InfoHelpers
         relative + stringifyable.to_s
     end
 
-    def site?
-        data.respond_to?(:site)
+    def paperwork?
+        data.respond_to?(:paperwork)
     end
 
     def navbar?
-        site? && data.site.respond_to?(:navbar)
+        paperwork? && data.paperwork.respond_to?(:navbar)
     end
 
     def navbar_links
-        nav = data.site.navbar.links if navbar?
+        nav = data.paperwork.navbar.links if navbar?
         nav ||= {}
+        mapped = {}
         nav.each do |name, link|
-            nav[name] = relative_link(link)
+            mapped[name] = relative_link(link)
         end
-        nav
+        mapped
     end
 
     def navbar_brand
-        data.site.navbar.brand if navbar?
+        data.paperwork.navbar.brand if navbar?
     end
 
     def footer_text
-        data.site.footer if site?
+        data.paperwork.footer if paperwork?
     end
 end

data/lib/paperwork/tasks/template.rb

@@ -28,13 +28,13 @@ module Paperwork
                 directory self.name => self.dependencies do
                     cp_r template, self.dir
                     Dir.chdir(self.dir) do
-                        Bundler.with_unbundled_env do
-                            Process.spawn(
-                                "bundle install --path=../.bundle/gems --jobs 8 --without test development",
-                                out: :out,
-                                in: :in,
-                                err: :err
-                            )
+                        cmd = "bundle install --path=../.bundle/gems --jobs 8 --without test development"
+                        if defined? Bundler
+                            Bundler.with_unbundled_env do
+                                Process.spawn(cmd, out: :out, in: :in, err: :err)
+                            end
+                        else
+                            Process.spawn(cmd, out: :out, in: :in, err: :err)
                         end
                         Process.spawn("yarn install", out: :out, in: :in, err: :err)
                         Process.waitall

data/lib/paperwork/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Paperwork
-    VERSION = "0.2.4"
+    VERSION = "0.3.2"
 end

data/paperwork.gemspec

@@ -35,4 +35,5 @@ Gem::Specification.new do |spec|
 
     spec.add_runtime_dependency "rake", "~> 12.3"
     spec.add_runtime_dependency "redcarpet", "~> 3.5.0"
+    spec.add_runtime_dependency "thor", "~> 1.1.0"
 end

data/{site.yml → paperwork.yml}

@@ -5,3 +5,11 @@ navbar:
   links:
     Home: README.md
     Navbar Demo: nested_example/navdemo.md
+
+config:
+  name: doc
+  sources:
+    - README.md
+    - nested_example/navdemo.md
+    - custom.js
+    - custom.css

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperwork
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.2
 platform: ruby
 authors:
 - Tobias Schmid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -108,12 +108,25 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: 
 email:
 - couchbelag@gmail.com
 executables:
-- console
-- setup
+- paperwork
 extensions: []
 extra_rdoc_files: []
 files:
@@ -127,13 +140,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
+- bin/paperwork
 - custom.css
 - custom.js
 - lib/paperwork.rb
 - lib/paperwork/assets/paperwork/presentation.css
 - lib/paperwork/assets/presentation.css
+- lib/paperwork/cli.rb
 - lib/paperwork/config.rb
 - lib/paperwork/tasks.rb
 - lib/paperwork/tasks/base.rb
@@ -163,7 +176,7 @@ files:
 - lib/paperwork/version.rb
 - nested_example/navdemo.md
 - paperwork.gemspec
-- site.yml
+- paperwork.yml
 homepage: https://gitlab.com/couchbelag/paperwork
 licenses:
 - MIT

data/bin/console

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "paperwork"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here