bhook 0.2.2 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fbf30bb96c81aaa4b89f0709d42b878c1a53a0c87fed519d42796f15502adcc
-  data.tar.gz: f191aa122210048ce00af81de973a5adce5821a84851e774fcc864a89a300d08
+  metadata.gz: ca377d9173c2c530530b76f74aac1b3cceeec7665577f7514e5929ce374d4ee4
+  data.tar.gz: 40cc3cdee60aea179938e6a11f0262c384866c9adff2daaacbc34b20e8a78e2f
 SHA512:
-  metadata.gz: 01afd14cbb7f1e607b8306399cbad5e3a1de627be32923c5107868e3c06fce031266c6222f4bcf466cd3a19fd2c8ceb9c5a52a7e4ab535abd287a8fb1b5dcc98
-  data.tar.gz: 208dd8b71184dff3c7ebcc1d16c5f631c03a725166ec9dc532ce06a1a59a0705804480ad322a4547276c31a8e0ac2fcda54cc6968c04a4b70ab4c796d25ec599
+  metadata.gz: 8458e574ee89eb350d863e1373063b020414dfe94ba731a9b6b5db5f18d63184e4c2df444f734bfd7f7011bf0a307390a42d96fce50d5a34c25eacf9119e8b8a
+  data.tar.gz: d59b9f4a545a6f5ffcd84934f73670773234c890e5d2bd766bd4abc3a41083e2cd1588194a3e0f1a7e57761ed8c652f5b6d630e2ceab342dc697a2f82a51b6bb

data/.rubocop.yml

@@ -32,4 +32,5 @@ Metrics/BlockLength:
 Metrics/AbcSize:
   Exclude:
     - lib/bhook/args_parser.rb
+    - spec/**/*_spec.rb
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bhook (0.2.2)
+    bhook (0.3.1)
       git (~> 1.10)
       kramdown (~> 2.3)
       listen (~> 3.7)

data/README.md

@@ -9,11 +9,15 @@
 
 Bhook is a static website generator that works off a git repo containing a markdown file based wiki, like for example, the [India Startup Wiki](https://gitlab.com/india-startups/wiki).
 
+Since you control the source markdown, Bhook applies no restrictions on what you can put in there. Wanna embed a YouTube video in an `iframe`? Sure thing!
+
 I use this to create [HTML versions of the wiki](https://sidu.in/wiki/startups) and of [my essays](https://sidu.in/essays/) that I can publish.
 
 ## Installation
 
-Install it yourself as:
+`bhook` requires [`ruby`](https://www.ruby-lang.org/en/documentation/installation/). If you are on OSX or Linux, it is likely to already be installed. 
+
+To install `bhook` run:
 
     $ gem install bhook
 
@@ -22,7 +26,7 @@ Install it yourself as:
 Getting help:
 
 	$ bhook --help
-	Bhook version 0.2.0
+	Bhook version 0.3.0
 	Usage: bhook --source /source/path --output /output/path
 	    -s, --source=SOURCE              Path to version controlled directory containing source md files
 	    -o, --output=OUTPUT              Path to directory where output files are to be generated
@@ -33,11 +37,20 @@ Getting help:
 	        --benchmark                  Run a performance benchmark for the specified source
 	    -h, --help                       Prints this help
 
-How I use it:
+### 1-to-1 mode
 
 	➜  essays git:(main) ✗ bhook -s . -o /tmp/out -t /tmp/out/theme -w -v
 
-Here's an example `.bhook.yml` [config file](https://gitlab.com/india-startups/wiki/-/blob/master/.bhook.yml).
+Here's an example `.bhook.yml` [config file](https://gitlab.com/india-startups/wiki/-/blob/master/.bhook.yml) for a source directory.
+
+### n-to-1 mode
+
+This requires the destination directory to have a `.bhook.yml` config file set up that describes all the sources.
+
+	➜  kaiwren.github.com git:(main) ✗ bhook -w -v
+
+Here's an example `.bhook.yml` [config file](https://github.com/kaiwren/kaiwren.github.com/blob/master/.bhook.yml) for a destination directory
+with multiple source directories.
 
 ## Development
 

data/Rakefile

@@ -31,4 +31,4 @@ namespace :ci do
   task spec: %i[spec]
 end
 
-task default: %i[autocorrect_basic_style_issues rubocop sorbet spec]
+task default: %i[autocorrect_basic_style_issues sorbet spec rubocop]

data/bin/bhook

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'bhook'
+require_relative File.join('..', 'lib', 'bhook')
 
 puts "Bhook version #{Bhook::VERSION}"
 parser = Bhook::ArgsParser.new(ARGV)
@@ -15,24 +15,35 @@ if args.help
   exit
 end
 
+Bhook::L.level = args.verbose ? Logger::DEBUG : Logger::INFO
+
 if args.generate_theme
   Bhook::L.level = Logger::DEBUG
   Bhook::ThemeGenerator.new(args.generate_theme).generate!
   exit
 end
 
-Bhook::L.level = args.verbose ? Logger::DEBUG : Logger::INFO
+workspaces = Bhook::Workspaces.new
 
-workspace = Bhook::Workspace.new(args.source, args.output, args.theme)
+if args.mount
+  args.mount.each do |project, from_to|
+    from = File.expand_path(from_to['from'])
+    to = File.expand_path(from_to['to'])
+    Bhook::L.debug "Mounting: #{project} \n\tfrom #{from} \n\tto #{to}"
+    workspaces.mount(Bhook::Workspace.new(from, to, args.theme))
+  end
+else
+  workspaces.mount(Bhook::Workspace.new(args.source, args.output, args.theme))
+end
 
 if args.benchmark
   require 'benchmark'
   n = 10
   Benchmark.bmbm do |bench|
     Bhook::L.level = Logger::WARN
-    bench.report("Generate HTML #{n} times") { n.times { workspace.process! } }
+    bench.report("Generate HTML #{n} times") { n.times { workspaces.each(&:process!) } }
   end
   exit
 end
 
-args.watch ? workspace.watch! : workspace.process!
+args.watch ? workspaces.watch! : workspaces.process!

data/lib/bhook/args_parser.rb

@@ -5,25 +5,29 @@ module Bhook
   class ArgsParser
     extend T::Sig
 
-    Options = Struct.new(:source, :output, :watch, :verbose, :theme, :generate_theme, :benchmark, :help)
+    Options = Struct.new(:source, :output, :watch, :verbose, :theme, :generate_theme, :benchmark, :mount, :help)
 
     def initialize(argv)
-      @args = Options.new(nil, nil, false, false, Bhook::THEME_DIR_PATH, nil, false, false)
+      @args = Options.new(nil, nil, false, false, Bhook::THEME_DIR_PATH, nil, false, nil, false)
       @argv = argv.clone
       @opt_parser = build_opt_parser
     end
 
     def parse
+      if (mount = detect_and_read_mount_args_from_config_in_pwd)
+        @args.mount = mount
+      end
+
       begin
         @opt_parser.parse(@argv)
-        if generate_theme_missing? && help_missing? && source_or_output_paths_missing?
+        if generate_theme_missing? && help_missing? &&
+           source_or_output_paths_missing? && mount_config_missing?
           raise OptionParser::MissingArgument, 'See --help.'
         end
       rescue OptionParser::ParseError => e
         puts "\nError! #{e.message}\n"
         return nil
       end
-
       @args
     end
 
@@ -33,6 +37,17 @@ module Bhook
 
     private
 
+    def detect_and_read_mount_args_from_config_in_pwd
+      bhook_config_path = File.join(Dir.pwd, SourceConfig::BHOOK_CONFIG_FILE)
+      return unless File.exist?(bhook_config_path)
+
+      YAML.safe_load(File.read(bhook_config_path))['mount']
+    end
+
+    def mount_config_missing?
+      !@args.mount
+    end
+
     def help_missing?
       !@args.help
     end

data/lib/bhook/directory.rb

@@ -8,15 +8,15 @@ module Bhook
     GIT_DIR = '.git'
     MD_EXT = '.md'
 
-    sig { params(src_path: Pathname, out_path: Pathname).returns(Bhook::Directory) }
+    sig { params(src_path: Pathname, out_path: Pathname).returns(Bhook::RootDirectory) }
     def self.new_root_directory(src_path, out_path)
-      new(src_path, out_path, Git.open(src_path), Bhook::Config.new(src_path))
+      RootDirectory.new(src_path, out_path)
     end
 
-    sig { params(src_path: Pathname, out_path: Pathname, git: Git::Base, config: Bhook::Config).void }
+    sig { params(src_path: Pathname, out_path: Pathname, git: Git::Base, config: Bhook::SourceConfig).void }
     def initialize(src_path, out_path, git, config)
       @src_path = src_path
-      @out_path = T.let(out_path.join(src_path.basename), Pathname)
+      @out_path = T.let(build_out_path(src_path, out_path), Pathname)
       @git = git
       @config = config
       @sub_dirs = T.let([], T::Array[Directory])
@@ -46,6 +46,11 @@ module Bhook
 
     private
 
+    sig { params(src_path: Pathname, out_path: Pathname).returns(Pathname) }
+    def build_out_path(src_path, out_path)
+      out_path.join(src_path.basename)
+    end
+
     sig { void }
     def build_next_level_nodes
       children = @src_path.children

data/lib/bhook/md_file.rb

@@ -17,7 +17,7 @@ module Bhook
     sig { returns(String) }
     attr_reader :md
 
-    sig { params(src_file_path: Pathname, out_path: Pathname, git: Git::Base, config: Bhook::Config).void }
+    sig { params(src_file_path: Pathname, out_path: Pathname, git: Git::Base, config: Bhook::SourceConfig).void }
     def initialize(src_file_path, out_path, git, config)
       L.debug "Reading: #{src_file_path}"
       @md = T.let(File.read(src_file_path), String)

data/lib/bhook/root_directory.rb

@@ -0,0 +1,20 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Bhook
+  class RootDirectory < Directory
+    extend T::Sig
+
+    sig { params(src_path: Pathname, out_path: Pathname).void }
+    def initialize(src_path, out_path)
+      super(src_path, out_path, Git.open(src_path), Bhook::SourceConfig.new(src_path))
+    end
+
+    private
+
+    sig { params(_src_path: Pathname, out_path: Pathname).returns(Pathname) }
+    def build_out_path(_src_path, out_path)
+      out_path
+    end
+  end
+end

data/lib/bhook/{config.rb → source_config.rb}

@@ -8,7 +8,7 @@ module Bhook
   #   - link to place in the footer
   # - exclude
   #   - list of .md file paths relative to config files
-  class Config
+  class SourceConfig
     extend T::Sig
     BHOOK_CONFIG_FILE = T.let('.bhook.yml', String)
     WEBSITE_KEY = T.let('website', String)
@@ -40,7 +40,7 @@ module Bhook
 
     sig { params(excluded_files: T::Array[String]).returns(T::Array[Pathname]) }
     def parse_excluded_files(excluded_files)
-      excluded_files.map { |file_path| @root_dir_path.join(file_path) }
+      excluded_files.map { |file_path| @root_dir_path.join(file_path) if file_path }.compact
     end
 
     sig do

data/lib/bhook/theme/page.erb

@@ -5,25 +5,59 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
-  <link href='https://fonts.googleapis.com/css?family=Fira+Sans' rel='stylesheet' type='text/css'>
+  <link href='https://fonts.googleapis.com/css?family=Fira+Sans:500,400&display=swap' rel='stylesheet' type='text/css'>
 
   <!-- Bootstrap -->
   <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
   <style>
+      :root {
+          --header-margin-top: 0.5em;
+          --header-margin-bottom: 0.5em;
+          --body-font-size: 1.1rem;
+          --title-font-family: 'Fira Sans';
+          --title-font-size: 3.5rem;
+          --title-font-weight: 500;
+          --header-font-family: 'Fira Sans';
+          --header-font-weight: 500;
+          --content-font-family: 'Fira Sans';
+          --content-line-height: 1.7rem;
+          --content-font-weight: 400;
+          --paragraph-spacing: 1rem;
+          --toc-font-weight: 400;
+      }
+
       body {
-          font-family: 'Fira Sans', sans-serif;
+          font-family: sans-serif;
+          font-size: var(--body-font-size);
           color: #000000;
       }
 
-      h2, h3, h4, h5 {
-          margin-bottom: 0.5em;
-          margin-top: 0.5em;
+      div.content-wrapper {
+      }
+
+      div.content {
+          line-height: var(--content-line-height);
+          font-weight: var(--content-font-weight);
+          font-family: var(--content-font-family);
+      }
+
+      h1 {
+          font-family: var(--title-font-family);
+          font-size: var(--title-font-size);
+          font-weight: var(--title-font-weight);
       }
 
       h2 {
           border-bottom: 1px solid #eaeaea;
       }
 
+      h2, h3, h4, h5 {
+          font-family: var(--header-font-family);
+          font-weight: var(--header-font-weight);
+          margin-bottom: var(--header-margin-top);
+          margin-top: var(--header-margin-bottom);
+      }
+
       h2 a.header-anchor, h3 a.header-anchor,
       h4 a.header-anchor, h5 a.header-anchor {
           float: left;
@@ -46,13 +80,35 @@
           visibility: visible;
       }
 
+      div.content p {
+          margin-bottom: var(--paragraph-spacing);
+      }
+
+      ol#markdown-toc {
+          font-weight: var(--toc-font-weight);
+      }
+
       div.after-h1 {
           border-bottom: 1px solid #bbbbbb;
           margin-bottom: 1.5em;
       }
 
+      div.youtube-video {
+          margin: 1em 0 1em 0;
+          width: 100%;
+          justify-content: center;
+          display: flex;
+      }
+
       div.footer {
-          margin: 0.5em 0 1.5em 0;
+          margin: 0.5em 0 0.5em 0;
+      }
+
+      div.bhook-cta a {
+          font-size: x-small;
+          text-decoration: none;
+          margin-bottom: 1.5em;
+          color: #bbbbbb;
       }
 
       table {
@@ -87,8 +143,8 @@
 </head>
 <body>
 <div class="body container">
-  <div class="content row justify-content-center">
-    <div class="col-10">
+  <div class="content-wrapper row justify-content-center">
+    <div class="content col-10">
       <%= output %>
     </div>
   </div>
@@ -103,6 +159,9 @@
       <%= src_file_date -%> © <a href="https://sidu.in">Sidu Ponnappa</a>
     </div>
   </div>
+  <div class="bhook-cta d-flex justify-content-center">
+    <a href="https://gitlab.com/kaiwren/bhook" target="_blank">powered by bhook</a>
+  </div>
 </div>
 </body>
 </html>

data/lib/bhook/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Bhook
-  VERSION = '0.2.2'
+  VERSION = '0.3.2'
 end

data/lib/bhook/workspace.rb

@@ -28,19 +28,13 @@ module Bhook
         process!
       end
       listener.start
-      sleep
-    end
-
-    sig { returns(T::Array[MdFile]) }
-    def all_md_files
-      root_dir.all_md_files
     end
 
     private
 
     sig { returns(Bhook::Directory) }
     def root_dir
-      Directory.new_root_directory(@src_path, @out_path)
+      RootDirectory.new(@src_path, @out_path)
     end
   end
 end

data/lib/bhook/workspaces.rb

@@ -0,0 +1,29 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Bhook
+  class Workspaces
+    extend T::Sig
+
+    sig { void }
+    def initialize
+      @workspaces = T.let([], T::Array[Bhook::Workspace])
+    end
+
+    sig { params(workspace: Workspace).void }
+    def mount(workspace)
+      @workspaces << workspace
+    end
+
+    sig { void }
+    def process!
+      @workspaces.each(&:process!)
+    end
+
+    sig { void }
+    def watch!
+      @workspaces.each(&:watch!)
+      Kernel.sleep
+    end
+  end
+end

data/lib/bhook.rb

@@ -27,10 +27,12 @@ end
 require_relative 'bhook/version'
 require_relative 'bhook/logger'
 require_relative 'bhook/args_parser'
-require_relative 'bhook/config'
+require_relative 'bhook/source_config'
 require_relative 'bhook/theme_generator'
 require_relative 'bhook/theme'
 require_relative 'bhook/converter/html'
 require_relative 'bhook/directory'
+require_relative 'bhook/root_directory'
 require_relative 'bhook/md_file'
 require_relative 'bhook/workspace'
+require_relative 'bhook/workspaces'

data/sorbet/rbi/hidden-definitions/hidden.rbi

@@ -28,7 +28,7 @@ class Bhook::ArgsParser::Options
   def self.members(); end
 end
 
-class Bhook::Config
+class Bhook::SourceConfig
   extend ::T::Private::Methods::MethodHooks
   extend ::T::Private::Methods::SingletonMethodHooks
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhook
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.2
 platform: ruby
 authors:
 - Sidu Ponnappa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-13 00:00:00.000000000 Z
+date: 2022-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -197,17 +197,19 @@ files:
 - bin/bhook
 - lib/bhook.rb
 - lib/bhook/args_parser.rb
-- lib/bhook/config.rb
 - lib/bhook/converter/html.rb
 - lib/bhook/directory.rb
 - lib/bhook/logger.rb
 - lib/bhook/md_file.rb
+- lib/bhook/root_directory.rb
+- lib/bhook/source_config.rb
 - lib/bhook/theme.rb
 - lib/bhook/theme/_after_h1.erb
 - lib/bhook/theme/page.erb
 - lib/bhook/theme_generator.rb
 - lib/bhook/version.rb
 - lib/bhook/workspace.rb
+- lib/bhook/workspaces.rb
 - sorbet/config
 - sorbet/rbi/gems/ast.rbi
 - sorbet/rbi/gems/bhook.rbi